diff options
Diffstat (limited to 'drivers/staging/comedi/drivers/addi-data')
47 files changed, 754 insertions, 754 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c index 20450ba03504..73357d1196ce 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c @@ -32,7 +32,7 @@ | BYTE_ b_InputClockLevel, | | BYTE_ b_OutputLevel, | | BYTE_ b_HardwareGateLevel) -INT i_InsnConfig_InitTimer(comedi_device *dev,comedi_subdevice *s, +INT i_InsnConfig_InitTimer(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ @@ -219,7 +219,7 @@ INT i_InsnConfig_InitTimer(comedi_device *dev,comedi_subdevice *s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnConfigInitTimer(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -406,7 +406,7 @@ INT i_APCI1710_InsnConfigInitTimer(comedi_device * dev, comedi_subdevice * s, | BYTE_ b_ModulNbr, | | BYTE_ b_TimerNbr, | | BYTE_ b_InterruptEnable) -INT i_APCI1710_InsnWriteEnableDisableTimer(comedi_device *dev,comedi_subdevice *s, +INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Enable OR Disable the Timer (b_TimerNbr) from selected module | @@ -448,7 +448,7 @@ i_ReturnValue=insn->n; +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnWriteEnableDisableTimer(comedi_device * dev, +INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -561,7 +561,7 @@ INT i_APCI1710_InsnWriteEnableDisableTimer(comedi_device * dev, | (BYTE_ b_BoardHandle, | | BYTE_ b_ModulNbr, | | PULONG_ pul_TimerValueArray) -INT i_APCI1710_InsnReadAllTimerValue(comedi_device *dev,comedi_subdevice *s, +INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the all timer values from selected timer | @@ -590,7 +590,7 @@ INT i_APCI1710_InsnReadAllTimerValue(comedi_device *dev,comedi_subdevice *s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnReadAllTimerValue(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { INT i_ReturnValue = 0; @@ -668,7 +668,7 @@ INT i_APCI1710_InsnReadAllTimerValue(comedi_device *dev, comedi_subdevice *s, /* +----------------------------------------------------------------------------+ -| Function Name :INT i_APCI1710_InsnBitsTimer(comedi_device *dev, +| Function Name :INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev, comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read write functions for Timer | @@ -681,7 +681,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnBitsTimer(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnBitsTimer(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { BYTE b_BitsType; @@ -760,7 +760,7 @@ INT i_APCI1710_InsnBitsTimer(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_ReadTimerValue(comedi_device * dev, +INT i_APCI1710_ReadTimerValue(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_TimerNbr, PULONG pul_TimerValue) { @@ -848,7 +848,7 @@ INT i_APCI1710_ReadTimerValue(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_GetTimerOutputLevel(comedi_device * dev, +INT i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_TimerNbr, PBYTE pb_OutputLevel) { @@ -927,7 +927,7 @@ INT i_APCI1710_GetTimerOutputLevel(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_GetTimerProgressStatus(comedi_device *dev, +INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_TimerNbr, PBYTE pb_TimerStatus) { @@ -1006,7 +1006,7 @@ INT i_APCI1710_GetTimerProgressStatus(comedi_device *dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_WriteTimerValue(comedi_device * dev, +INT i_APCI1710_WriteTimerValue(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_TimerNbr, ULONG ul_WriteValue) { diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h index 80ee66233ec6..c17ac8ce251c 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h @@ -34,40 +34,40 @@ /* * 82X54 TIMER INISIALISATION FUNCTION */ -INT i_APCI1710_InsnConfigInitTimer(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnConfigInitTimer(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InsnWriteEnableDisableTimer(comedi_device *dev, +INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /* * 82X54 READ FUNCTION */ -INT i_APCI1710_InsnReadAllTimerValue(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InsnBitsTimer(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /* * 82X54 READ & WRITE FUNCTION */ -INT i_APCI1710_ReadTimerValue(comedi_device *dev, +INT i_APCI1710_ReadTimerValue(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_TimerNbr, PULONG pul_TimerValue); -INT i_APCI1710_GetTimerOutputLevel(comedi_device *dev, +INT i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_TimerNbr, PBYTE pb_OutputLevel); -INT i_APCI1710_GetTimerProgressStatus(comedi_device *dev, +INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_TimerNbr, PBYTE pb_TimerStatus); /* * 82X54 WRITE FUNCTION */ -INT i_APCI1710_WriteTimerValue(comedi_device *dev, +INT i_APCI1710_WriteTimerValue(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_TimerNbr, ULONG ul_WriteValue); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c index 25242871d470..75361fbaeefd 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c @@ -131,7 +131,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnConfigInitChrono(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -790,7 +790,7 @@ INT i_APCI1710_InsnConfigInitChrono(comedi_device * dev, comedi_subdevice * s, | BYTE_ b_ModulNbr, | | BYTE_ b_CycleMode, | | BYTE_ b_InterruptEnable) -INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device *dev, +INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev, comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Enable the chronometer from selected module | @@ -840,7 +840,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device * dev, +INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -1077,7 +1077,7 @@ INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device * dev, /* +----------------------------------------------------------------------------+ -| Function Name :INT i_APCI1710_InsnReadChrono(comedi_device *dev,comedi_subdevice *s, +| Function Name :INT i_APCI1710_InsnReadChrono(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read functions for Timer | @@ -1090,7 +1090,7 @@ comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnReadChrono(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnReadChrono(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { BYTE b_ReadType; @@ -1194,7 +1194,7 @@ INT i_APCI1710_InsnReadChrono(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_GetChronoProgressStatus(comedi_device * dev, +INT i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev, BYTE b_ModulNbr, PBYTE pb_ChronoStatus) { INT i_ReturnValue = 0; @@ -1355,7 +1355,7 @@ INT i_APCI1710_GetChronoProgressStatus(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_ReadChronoValue(comedi_device * dev, +INT i_APCI1710_ReadChronoValue(struct comedi_device * dev, BYTE b_ModulNbr, UINT ui_TimeOut, PBYTE pb_ChronoStatus, PULONG pul_ChronoValue) { @@ -1619,7 +1619,7 @@ INT i_APCI1710_ReadChronoValue(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_ConvertChronoValue(comedi_device * dev, +INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev, BYTE b_ModulNbr, ULONG ul_ChronoValue, PULONG pul_Hour, @@ -1757,7 +1757,7 @@ INT i_APCI1710_ConvertChronoValue(comedi_device * dev, /* +----------------------------------------------------------------------------+ -| Function Name : INT i_APCI1710_InsnBitsChronoDigitalIO(comedi_device *dev,comedi_subdevice *s, +| Function Name : INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Sets the output witch has been passed with the | @@ -1876,7 +1876,7 @@ INT i_APCI1710_ConvertChronoValue(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnBitsChronoDigitalIO(comedi_device * dev, +INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h index 9f6d0f003de4..ca4f5e117d5b 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h @@ -35,10 +35,10 @@ /* * CHRONOMETER INISIALISATION FUNCTION */ -INT i_APCI1710_InsnConfigInitChrono(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device *dev, +INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); @@ -46,18 +46,18 @@ INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device *dev, /* * CHRONOMETER READ FUNCTION */ -INT i_APCI1710_InsnReadChrono(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnReadChrono(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_GetChronoProgressStatus(comedi_device *dev, +INT i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev, BYTE b_ModulNbr, PBYTE pb_ChronoStatus); -INT i_APCI1710_ReadChronoValue(comedi_device *dev, +INT i_APCI1710_ReadChronoValue(struct comedi_device *dev, BYTE b_ModulNbr, UINT ui_TimeOut, PBYTE pb_ChronoStatus, PULONG pul_ChronoValue); -INT i_APCI1710_ConvertChronoValue(comedi_device *dev, +INT i_APCI1710_ConvertChronoValue(struct comedi_device *dev, BYTE b_ModulNbr, ULONG ul_ChronoValue, PULONG pul_Hour, @@ -69,6 +69,6 @@ INT i_APCI1710_ConvertChronoValue(comedi_device *dev, /* * CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION */ -INT i_APCI1710_InsnBitsChronoDigitalIO(comedi_device *dev, +INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c index 87dba6a83d83..586a897a633c 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c @@ -61,7 +61,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc /* +----------------------------------------------------------------------------+ -| Function Name : INT i_APCI1710_InsnConfigDigitalIO(comedi_device *dev, | +| Function Name : INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, | | comedi_subdevice *s,comedi_insn *insn,unsigned int *data)| +----------------------------------------------------------------------------+ | Task : Configure the digital I/O operating mode from selected | @@ -99,7 +99,7 @@ Activates and deactivates the digital output memory. +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { BYTE b_ModulNbr, b_ChannelAMode, b_ChannelBMode; @@ -247,7 +247,7 @@ INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -|INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device *dev,comedi_subdevice +|INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) +----------------------------------------------------------------------------+ @@ -293,7 +293,7 @@ INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s, // BYTE_ b_InputChannel, // // PBYTE_ pb_ChannelStatus) -INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device * dev, +INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -481,7 +481,7 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device * dev, //_INT_ i_APCI1710_SetDigitalIOChlOn (BYTE_ b_BoardHandle, // BYTE_ b_ModulNbr, // BYTE_ b_OutputChannel) -INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev, +INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -676,7 +676,7 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev, /* +----------------------------------------------------------------------------+ -|INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device *dev,comedi_subdevice +|INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) +----------------------------------------------------------------------------+ | Task : write: @@ -728,7 +728,7 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev, //_INT_ i_APCI1710_SetDigitalIOPortOn (BYTE_ b_BoardHandle, // BYTE_ b_ModulNbr, // BYTE_ b_PortValue) -INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device * dev, +INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h index 76dbf0840889..846e9000651b 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h @@ -27,20 +27,20 @@ /* * DIGITAL I/O INISIALISATION FUNCTION */ -INT i_APCI1710_InsnConfigDigitalIO(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /* * INPUT OUTPUT FUNCTIONS */ -INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device *dev, +INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device *dev, +INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device *dev, +INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c index 5ad6abff41a5..b8b4dedb0940 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c @@ -61,7 +61,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc /* +----------------------------------------------------------------------------+ -| INT i_APCI1710_InsnConfigINCCPT(comedi_device *dev,comedi_subdevice *s, +| INT i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) +----------------------------------------------------------------------------+ @@ -75,7 +75,7 @@ comedi_insn *insn,unsigned int *data) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnConfigINCCPT(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnConfigINCCPT(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_ConfigType; @@ -299,7 +299,7 @@ INT i_APCI1710_InsnConfigINCCPT(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InitCounter(comedi_device * dev, +INT i_APCI1710_InitCounter(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_CounterRange, BYTE b_FirstCounterModus, @@ -545,7 +545,7 @@ INT i_APCI1710_InitCounter(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_CounterAutoTest(comedi_device * dev, PBYTE pb_TestStatus) +INT i_APCI1710_CounterAutoTest(struct comedi_device * dev, PBYTE pb_TestStatus) { BYTE b_ModulCpt = 0; INT i_ReturnValue = 0; @@ -708,7 +708,7 @@ INT i_APCI1710_CounterAutoTest(comedi_device * dev, PBYTE pb_TestStatus) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InitIndex(comedi_device * dev, +INT i_APCI1710_InitIndex(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_ReferenceAction, BYTE b_IndexOperation, BYTE b_AutoMode, BYTE b_InterruptEnable) @@ -1152,7 +1152,7 @@ INT i_APCI1710_InitIndex(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InitReference(comedi_device * dev, +INT i_APCI1710_InitReference(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_ReferenceLevel) { INT i_ReturnValue = 0; @@ -1277,7 +1277,7 @@ INT i_APCI1710_InitReference(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InitExternalStrobe(comedi_device * dev, +INT i_APCI1710_InitExternalStrobe(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_ExternalStrobe, BYTE b_ExternalStrobeLevel) { INT i_ReturnValue = 0; @@ -1391,7 +1391,7 @@ INT i_APCI1710_InitExternalStrobe(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InitCompareLogic(comedi_device * dev, +INT i_APCI1710_InitCompareLogic(struct comedi_device * dev, BYTE b_ModulNbr, UINT ui_CompareValue) { INT i_ReturnValue = 0; @@ -1487,7 +1487,7 @@ INT i_APCI1710_InitCompareLogic(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InitFrequencyMeasurement(comedi_device * dev, +INT i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_PCIInputClock, BYTE b_TimingUnity, @@ -2002,7 +2002,7 @@ INT i_APCI1710_InitFrequencyMeasurement(comedi_device * dev, /* +----------------------------------------------------------------------------+ -| Function Name :INT i_APCI1710_InsnBitsINCCPT(comedi_device *dev,comedi_subdevice *s, +| Function Name :INT i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Set & Clear Functions for INC_CPT | @@ -2015,7 +2015,7 @@ comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnBitsINCCPT(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnBitsINCCPT(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_BitsType; @@ -2091,7 +2091,7 @@ INT i_APCI1710_InsnBitsINCCPT(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_ClearCounterValue(comedi_device * dev, BYTE b_ModulNbr) +INT i_APCI1710_ClearCounterValue(struct comedi_device * dev, BYTE b_ModulNbr) { INT i_ReturnValue = 0; @@ -2151,7 +2151,7 @@ INT i_APCI1710_ClearCounterValue(comedi_device * dev, BYTE b_ModulNbr) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_ClearAllCounterValue(comedi_device * dev) +INT i_APCI1710_ClearAllCounterValue(struct comedi_device * dev) { BYTE b_ModulCpt = 0; INT i_ReturnValue = 0; @@ -2297,7 +2297,7 @@ INT i_APCI1710_ClearAllCounterValue(comedi_device * dev) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_SetInputFilter(comedi_device * dev, +INT i_APCI1710_SetInputFilter(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_PCIInputClock, BYTE b_Filter) { INT i_ReturnValue = 0; @@ -2561,7 +2561,7 @@ INT i_APCI1710_SetInputFilter(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_LatchCounter(comedi_device * dev, +INT i_APCI1710_LatchCounter(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_LatchReg) { INT i_ReturnValue = 0; @@ -2658,7 +2658,7 @@ INT i_APCI1710_LatchCounter(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_SetIndexAndReferenceSource(comedi_device * dev, +INT i_APCI1710_SetIndexAndReferenceSource(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_SourceSelection) { INT i_ReturnValue = 0; @@ -2795,7 +2795,7 @@ INT i_APCI1710_SetIndexAndReferenceSource(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_SetDigitalChlOn(comedi_device * dev, BYTE b_ModulNbr) +INT i_APCI1710_SetDigitalChlOn(struct comedi_device * dev, BYTE b_ModulNbr) { INT i_ReturnValue = 0; @@ -2875,7 +2875,7 @@ INT i_APCI1710_SetDigitalChlOn(comedi_device * dev, BYTE b_ModulNbr) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_SetDigitalChlOff(comedi_device * dev, BYTE b_ModulNbr) +INT i_APCI1710_SetDigitalChlOff(struct comedi_device * dev, BYTE b_ModulNbr) { INT i_ReturnValue = 0; @@ -2939,7 +2939,7 @@ INT i_APCI1710_SetDigitalChlOff(comedi_device * dev, BYTE b_ModulNbr) /* +----------------------------------------------------------------------------+ -| Function Name :INT i_APCI1710_InsnWriteINCCPT(comedi_device *dev,comedi_subdevice *s, +| Function Name :INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Enable Disable functions for INC_CPT | @@ -2951,7 +2951,7 @@ comedi_insn *insn,unsigned int *data) | | Return Value : +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnWriteINCCPT(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnWriteINCCPT(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_WriteType; @@ -3047,7 +3047,7 @@ INT i_APCI1710_InsnWriteINCCPT(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_EnableLatchInterrupt(comedi_device * dev, BYTE b_ModulNbr) +INT i_APCI1710_EnableLatchInterrupt(struct comedi_device * dev, BYTE b_ModulNbr) { INT i_ReturnValue = 0; @@ -3133,7 +3133,7 @@ INT i_APCI1710_EnableLatchInterrupt(comedi_device * dev, BYTE b_ModulNbr) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_DisableLatchInterrupt(comedi_device * dev, BYTE b_ModulNbr) +INT i_APCI1710_DisableLatchInterrupt(struct comedi_device * dev, BYTE b_ModulNbr) { INT i_ReturnValue = 0; @@ -3231,7 +3231,7 @@ INT i_APCI1710_DisableLatchInterrupt(comedi_device * dev, BYTE b_ModulNbr) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_Write16BitCounterValue(comedi_device * dev, +INT i_APCI1710_Write16BitCounterValue(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_SelectedCounter, UINT ui_WriteValue) { INT i_ReturnValue = 0; @@ -3316,7 +3316,7 @@ INT i_APCI1710_Write16BitCounterValue(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_Write32BitCounterValue(comedi_device * dev, +INT i_APCI1710_Write32BitCounterValue(struct comedi_device * dev, BYTE b_ModulNbr, ULONG ul_WriteValue) { INT i_ReturnValue = 0; @@ -3383,7 +3383,7 @@ INT i_APCI1710_Write32BitCounterValue(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_EnableIndex(comedi_device * dev, BYTE b_ModulNbr) +INT i_APCI1710_EnableIndex(struct comedi_device * dev, BYTE b_ModulNbr) { INT i_ReturnValue = 0; ULONG ul_InterruptLatchReg; @@ -3481,7 +3481,7 @@ INT i_APCI1710_EnableIndex(comedi_device * dev, BYTE b_ModulNbr) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_DisableIndex(comedi_device * dev, BYTE b_ModulNbr) +INT i_APCI1710_DisableIndex(struct comedi_device * dev, BYTE b_ModulNbr) { INT i_ReturnValue = 0; @@ -3580,7 +3580,7 @@ INT i_APCI1710_DisableIndex(comedi_device * dev, BYTE b_ModulNbr) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_EnableCompareLogic(comedi_device * dev, BYTE b_ModulNbr) +INT i_APCI1710_EnableCompareLogic(struct comedi_device * dev, BYTE b_ModulNbr) { INT i_ReturnValue = 0; @@ -3680,7 +3680,7 @@ INT i_APCI1710_EnableCompareLogic(comedi_device * dev, BYTE b_ModulNbr) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_DisableCompareLogic(comedi_device * dev, BYTE b_ModulNbr) +INT i_APCI1710_DisableCompareLogic(struct comedi_device * dev, BYTE b_ModulNbr) { INT i_ReturnValue = 0; @@ -3789,7 +3789,7 @@ INT i_APCI1710_DisableCompareLogic(comedi_device * dev, BYTE b_ModulNbr) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_EnableFrequencyMeasurement(comedi_device * dev, +INT i_APCI1710_EnableFrequencyMeasurement(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_InterruptEnable) { INT i_ReturnValue = 0; @@ -3936,7 +3936,7 @@ INT i_APCI1710_EnableFrequencyMeasurement(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_DisableFrequencyMeasurement(comedi_device * dev, BYTE b_ModulNbr) +INT i_APCI1710_DisableFrequencyMeasurement(struct comedi_device * dev, BYTE b_ModulNbr) { INT i_ReturnValue = 0; @@ -4037,7 +4037,7 @@ INT i_APCI1710_DisableFrequencyMeasurement(comedi_device * dev, BYTE b_ModulNbr) /* +----------------------------------------------------------------------------+ -| Function Name :INT i_APCI1710_InsnWriteINCCPT(comedi_device *dev,comedi_subdevice *s, +| Function Name :INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read and Get functions for INC_CPT | @@ -4049,7 +4049,7 @@ comedi_insn *insn,unsigned int *data) | | Return Value : +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnReadINCCPT(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnReadINCCPT(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_ReadType; @@ -4193,7 +4193,7 @@ INT i_APCI1710_InsnReadINCCPT(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_ReadLatchRegisterStatus(comedi_device * dev, +INT i_APCI1710_ReadLatchRegisterStatus(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_LatchReg, PBYTE pb_LatchStatus) { INT i_ReturnValue = 0; @@ -4280,7 +4280,7 @@ INT i_APCI1710_ReadLatchRegisterStatus(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_ReadLatchRegisterValue(comedi_device * dev, +INT i_APCI1710_ReadLatchRegisterValue(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_LatchReg, PULONG pul_LatchValue) { INT i_ReturnValue = 0; @@ -4364,7 +4364,7 @@ INT i_APCI1710_ReadLatchRegisterValue(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_Read16BitCounterValue(comedi_device * dev, +INT i_APCI1710_Read16BitCounterValue(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_SelectedCounter, PUINT pui_CounterValue) { INT i_ReturnValue = 0; @@ -4459,7 +4459,7 @@ INT i_APCI1710_Read16BitCounterValue(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_Read32BitCounterValue(comedi_device * dev, +INT i_APCI1710_Read32BitCounterValue(struct comedi_device * dev, BYTE b_ModulNbr, PULONG pul_CounterValue) { INT i_ReturnValue = 0; @@ -4535,7 +4535,7 @@ INT i_APCI1710_Read32BitCounterValue(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_GetIndexStatus(comedi_device * dev, +INT i_APCI1710_GetIndexStatus(struct comedi_device * dev, BYTE b_ModulNbr, PBYTE pb_IndexStatus) { INT i_ReturnValue = 0; @@ -4619,7 +4619,7 @@ INT i_APCI1710_GetIndexStatus(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_GetReferenceStatus(comedi_device * dev, +INT i_APCI1710_GetReferenceStatus(struct comedi_device * dev, BYTE b_ModulNbr, PBYTE pb_ReferenceStatus) { INT i_ReturnValue = 0; @@ -4703,7 +4703,7 @@ INT i_APCI1710_GetReferenceStatus(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_GetUASStatus(comedi_device * dev, +INT i_APCI1710_GetUASStatus(struct comedi_device * dev, BYTE b_ModulNbr, PBYTE pb_UASStatus) { INT i_ReturnValue = 0; @@ -4771,7 +4771,7 @@ INT i_APCI1710_GetUASStatus(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_GetCBStatus(comedi_device * dev, +INT i_APCI1710_GetCBStatus(struct comedi_device * dev, BYTE b_ModulNbr, PBYTE pb_CBStatus) { INT i_ReturnValue = 0; @@ -4853,7 +4853,7 @@ INT i_APCI1710_GetCBStatus(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_Get16BitCBStatus(comedi_device * dev, +INT i_APCI1710_Get16BitCBStatus(struct comedi_device * dev, BYTE b_ModulNbr, PBYTE pb_CBStatusCounter0, PBYTE pb_CBStatusCounter1) { INT i_ReturnValue = 0; @@ -4966,7 +4966,7 @@ INT i_APCI1710_Get16BitCBStatus(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_GetUDStatus(comedi_device * dev, +INT i_APCI1710_GetUDStatus(struct comedi_device * dev, BYTE b_ModulNbr, PBYTE pb_UDStatus) { INT i_ReturnValue = 0; @@ -5040,7 +5040,7 @@ INT i_APCI1710_GetUDStatus(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_GetInterruptUDLatchedStatus(comedi_device * dev, +INT i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device * dev, BYTE b_ModulNbr, PBYTE pb_UDStatus) { INT i_ReturnValue = 0; @@ -5145,7 +5145,7 @@ INT i_APCI1710_GetInterruptUDLatchedStatus(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_ReadFrequencyMeasurement(comedi_device * dev, +INT i_APCI1710_ReadFrequencyMeasurement(struct comedi_device * dev, BYTE b_ModulNbr, PBYTE pb_Status, PBYTE pb_UDStatus, PULONG pul_ReadValue) { diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h index 8abcaa4a971c..a4189aeecaad 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h @@ -132,22 +132,22 @@ #define APCI1710_INCCPT_DISABLEFREQUENCYMEASUREMENT 409 /************ Main Functions *************/ -INT i_APCI1710_InsnConfigINCCPT(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int * data); -INT i_APCI1710_InsnBitsINCCPT(comedi_device *dev, comedi_subdevice * s, +INT i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev, comedi_subdevice * s, comedi_insn *insn, unsigned int * data); -INT i_APCI1710_InsnWriteINCCPT(comedi_device *dev, comedi_subdevice * s, +INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev, comedi_subdevice * s, comedi_insn *insn, unsigned int * data); -INT i_APCI1710_InsnReadINCCPT(comedi_device *dev, comedi_subdevice * s, +INT i_APCI1710_InsnReadINCCPT(struct comedi_device *dev, comedi_subdevice * s, comedi_insn *insn, unsigned int * data); /*********** Supplementary Functions********/ /* INSN CONFIG */ -INT i_APCI1710_InitCounter(comedi_device *dev, +INT i_APCI1710_InitCounter(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_CounterRange, BYTE b_FirstCounterModus, @@ -155,25 +155,25 @@ INT i_APCI1710_InitCounter(comedi_device *dev, BYTE b_SecondCounterModus, BYTE b_SecondCounterOption); -INT i_APCI1710_CounterAutoTest(comedi_device *dev, PBYTE pb_TestStatus); +INT i_APCI1710_CounterAutoTest(struct comedi_device *dev, PBYTE pb_TestStatus); -INT i_APCI1710_InitIndex(comedi_device *dev, +INT i_APCI1710_InitIndex(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_ReferenceAction, BYTE b_IndexOperation, BYTE b_AutoMode, BYTE b_InterruptEnable); -INT i_APCI1710_InitReference(comedi_device *dev, +INT i_APCI1710_InitReference(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_ReferenceLevel); -INT i_APCI1710_InitExternalStrobe(comedi_device *dev, +INT i_APCI1710_InitExternalStrobe(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_ExternalStrobe, BYTE b_ExternalStrobeLevel); -INT i_APCI1710_InitCompareLogic(comedi_device *dev, +INT i_APCI1710_InitCompareLogic(struct comedi_device *dev, BYTE b_ModulNbr, UINT ui_CompareValue); -INT i_APCI1710_InitFrequencyMeasurement(comedi_device *dev, +INT i_APCI1710_InitFrequencyMeasurement(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_PCIInputClock, BYTE b_TimingUnity, @@ -181,91 +181,91 @@ INT i_APCI1710_InitFrequencyMeasurement(comedi_device *dev, PULONG pul_RealTimingInterval); /* INSN BITS */ -INT i_APCI1710_ClearCounterValue(comedi_device *dev, BYTE b_ModulNbr); +INT i_APCI1710_ClearCounterValue(struct comedi_device *dev, BYTE b_ModulNbr); -INT i_APCI1710_ClearAllCounterValue(comedi_device *dev); +INT i_APCI1710_ClearAllCounterValue(struct comedi_device *dev); -INT i_APCI1710_SetInputFilter(comedi_device *dev, +INT i_APCI1710_SetInputFilter(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_PCIInputClock, BYTE b_Filter); -INT i_APCI1710_LatchCounter(comedi_device *dev, +INT i_APCI1710_LatchCounter(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_LatchReg); -INT i_APCI1710_SetIndexAndReferenceSource(comedi_device *dev, +INT i_APCI1710_SetIndexAndReferenceSource(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_SourceSelection); -INT i_APCI1710_SetDigitalChlOn(comedi_device *dev, BYTE b_ModulNbr); +INT i_APCI1710_SetDigitalChlOn(struct comedi_device *dev, BYTE b_ModulNbr); -INT i_APCI1710_SetDigitalChlOff(comedi_device *dev, BYTE b_ModulNbr); +INT i_APCI1710_SetDigitalChlOff(struct comedi_device *dev, BYTE b_ModulNbr); /* INSN WRITE */ -INT i_APCI1710_EnableLatchInterrupt(comedi_device *dev, BYTE b_ModulNbr); +INT i_APCI1710_EnableLatchInterrupt(struct comedi_device *dev, BYTE b_ModulNbr); -INT i_APCI1710_DisableLatchInterrupt(comedi_device *dev, BYTE b_ModulNbr); +INT i_APCI1710_DisableLatchInterrupt(struct comedi_device *dev, BYTE b_ModulNbr); -INT i_APCI1710_Write16BitCounterValue(comedi_device *dev, +INT i_APCI1710_Write16BitCounterValue(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_SelectedCounter, UINT ui_WriteValue); -INT i_APCI1710_Write32BitCounterValue(comedi_device *dev, +INT i_APCI1710_Write32BitCounterValue(struct comedi_device *dev, BYTE b_ModulNbr, ULONG ul_WriteValue); -INT i_APCI1710_EnableIndex(comedi_device *dev, BYTE b_ModulNbr); +INT i_APCI1710_EnableIndex(struct comedi_device *dev, BYTE b_ModulNbr); -INT i_APCI1710_DisableIndex(comedi_device *dev, BYTE b_ModulNbr); +INT i_APCI1710_DisableIndex(struct comedi_device *dev, BYTE b_ModulNbr); -INT i_APCI1710_EnableCompareLogic(comedi_device *dev, BYTE b_ModulNbr); +INT i_APCI1710_EnableCompareLogic(struct comedi_device *dev, BYTE b_ModulNbr); -INT i_APCI1710_DisableCompareLogic(comedi_device *dev, BYTE b_ModulNbr); +INT i_APCI1710_DisableCompareLogic(struct comedi_device *dev, BYTE b_ModulNbr); -INT i_APCI1710_EnableFrequencyMeasurement(comedi_device *dev, +INT i_APCI1710_EnableFrequencyMeasurement(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_InterruptEnable); -INT i_APCI1710_DisableFrequencyMeasurement(comedi_device *dev, +INT i_APCI1710_DisableFrequencyMeasurement(struct comedi_device *dev, BYTE b_ModulNbr); /* INSN READ */ -INT i_APCI1710_ReadLatchRegisterStatus(comedi_device *dev, +INT i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_LatchReg, PBYTE pb_LatchStatus); -INT i_APCI1710_ReadLatchRegisterValue(comedi_device *dev, +INT i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_LatchReg, PULONG pul_LatchValue); -INT i_APCI1710_Read16BitCounterValue(comedi_device *dev, +INT i_APCI1710_Read16BitCounterValue(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_SelectedCounter, PUINT pui_CounterValue); -INT i_APCI1710_Read32BitCounterValue(comedi_device *dev, +INT i_APCI1710_Read32BitCounterValue(struct comedi_device *dev, BYTE b_ModulNbr, PULONG pul_CounterValue); -INT i_APCI1710_GetIndexStatus(comedi_device *dev, +INT i_APCI1710_GetIndexStatus(struct comedi_device *dev, BYTE b_ModulNbr, PBYTE pb_IndexStatus); -INT i_APCI1710_GetReferenceStatus(comedi_device *dev, +INT i_APCI1710_GetReferenceStatus(struct comedi_device *dev, BYTE b_ModulNbr, PBYTE pb_ReferenceStatus); -INT i_APCI1710_GetUASStatus(comedi_device *dev, +INT i_APCI1710_GetUASStatus(struct comedi_device *dev, BYTE b_ModulNbr, PBYTE pb_UASStatus); -INT i_APCI1710_GetCBStatus(comedi_device *dev, +INT i_APCI1710_GetCBStatus(struct comedi_device *dev, BYTE b_ModulNbr, PBYTE pb_CBStatus); -INT i_APCI1710_Get16BitCBStatus(comedi_device *dev, +INT i_APCI1710_Get16BitCBStatus(struct comedi_device *dev, BYTE b_ModulNbr, PBYTE pb_CBStatusCounter0, PBYTE pb_CBStatusCounter1); -INT i_APCI1710_GetUDStatus(comedi_device *dev, +INT i_APCI1710_GetUDStatus(struct comedi_device *dev, BYTE b_ModulNbr, PBYTE pb_UDStatus); -INT i_APCI1710_GetInterruptUDLatchedStatus(comedi_device *dev, +INT i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device *dev, BYTE b_ModulNbr, PBYTE pb_UDStatus); -INT i_APCI1710_ReadFrequencyMeasurement(comedi_device *dev, +INT i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev, BYTE b_ModulNbr, PBYTE pb_Status, PBYTE pb_UDStatus, PULONG pul_ReadValue); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c index d6101c9a998a..e557e6c40cf6 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c @@ -123,7 +123,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnConfigInitPulseEncoder(comedi_device * dev, +INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -414,7 +414,7 @@ INT i_APCI1710_InsnConfigInitPulseEncoder(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(comedi_device * dev, +INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -708,7 +708,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(comedi_device * dev, PBYTE_ pb_Status) */ -INT i_APCI1710_InsnBitsReadWritePulseEncoder(comedi_device * dev, +INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -834,7 +834,7 @@ INT i_APCI1710_InsnBitsReadWritePulseEncoder(comedi_device * dev, return (i_ReturnValue); } -INT i_APCI1710_InsnReadInterruptPulseEncoder(comedi_device * dev, +INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h index c901a317fc61..1dbdc39f96e0 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h @@ -21,11 +21,11 @@ #define APCI1710_PULSEENCODER_READ 0 #define APCI1710_PULSEENCODER_WRITE 1 -INT i_APCI1710_InsnConfigInitPulseEncoder(comedi_device *dev, +INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(comedi_device *dev, +INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); @@ -33,7 +33,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(comedi_device *dev, /* * READ PULSE ENCODER FUNCTIONS */ -INT i_APCI1710_InsnReadInterruptPulseEncoder(comedi_device *dev, +INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); @@ -41,7 +41,7 @@ INT i_APCI1710_InsnReadInterruptPulseEncoder(comedi_device *dev, /* * WRITE PULSE ENCODER FUNCTIONS */ -INT i_APCI1710_InsnBitsReadWritePulseEncoder(comedi_device *dev, +INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c index 9a2dd408f38f..178d773563a1 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c @@ -57,7 +57,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc /* +----------------------------------------------------------------------------+ -| Function Name :INT i_APCI1710_InsnConfigPWM(comedi_device *dev, +| Function Name :INT i_APCI1710_InsnConfigPWM(struct comedi_device *dev, comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Pwm Init and Get Pwm Initialisation | @@ -70,7 +70,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnConfigPWM(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnConfigPWM(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { BYTE b_ConfigType; @@ -179,7 +179,7 @@ INT i_APCI1710_InsnConfigPWM(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InitPWM(comedi_device * dev, +INT i_APCI1710_InitPWM(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_PWM, BYTE b_ClockSelection, @@ -1534,7 +1534,7 @@ INT i_APCI1710_InitPWM(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_GetPWMInitialisation(comedi_device * dev, +INT i_APCI1710_GetPWMInitialisation(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_PWM, PBYTE pb_TimingUnit, @@ -1670,7 +1670,7 @@ INT i_APCI1710_GetPWMInitialisation(comedi_device * dev, /* +----------------------------------------------------------------------------+ -| Function Name :INT i_APCI1710_InsnWritePWM(comedi_device *dev, +| Function Name :INT i_APCI1710_InsnWritePWM(struct comedi_device *dev, comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Pwm Enable Disable and Set New Timing | @@ -1683,7 +1683,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnWritePWM(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnWritePWM(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { BYTE b_WriteType; @@ -1806,7 +1806,7 @@ INT i_APCI1710_InsnWritePWM(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_EnablePWM(comedi_device * dev, +INT i_APCI1710_EnablePWM(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_PWM, BYTE b_StartLevel, @@ -2062,7 +2062,7 @@ INT i_APCI1710_EnablePWM(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_DisablePWM(comedi_device * dev, BYTE b_ModulNbr, BYTE b_PWM) +INT i_APCI1710_DisablePWM(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_PWM) { INT i_ReturnValue = 0; DWORD dw_Status; @@ -2189,7 +2189,7 @@ INT i_APCI1710_DisablePWM(comedi_device * dev, BYTE b_ModulNbr, BYTE b_PWM) +----------------------------------------------------------------------------+ */ -INT i_APCI1710_SetNewPWMTiming(comedi_device * dev, +INT i_APCI1710_SetNewPWMTiming(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_PWM, BYTE b_TimingUnit, ULONG ul_LowTiming, ULONG ul_HighTiming) { @@ -3460,7 +3460,7 @@ INT i_APCI1710_SetNewPWMTiming(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnReadGetPWMStatus(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -3561,7 +3561,7 @@ INT i_APCI1710_InsnReadGetPWMStatus(comedi_device * dev, comedi_subdevice * s, return (i_ReturnValue); } -INT i_APCI1710_InsnBitsReadPWMInterrupt(comedi_device * dev, +INT i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { data[0] = devpriv->s_InterruptParameters. diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h index 1f40d00b10e6..0c10b1e8fab4 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h @@ -26,10 +26,10 @@ #define APCI1710_PWM_ENABLE 1 #define APCI1710_PWM_NEWTIMING 2 -INT i_APCI1710_InsnConfigPWM(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnConfigPWM(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InitPWM(comedi_device *dev, +INT i_APCI1710_InitPWM(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_PWM, BYTE b_ClockSelection, @@ -38,7 +38,7 @@ INT i_APCI1710_InitPWM(comedi_device *dev, ULONG ul_HighTiming, PULONG pul_RealLowTiming, PULONG pul_RealHighTiming); -INT i_APCI1710_GetPWMInitialisation(comedi_device *dev, +INT i_APCI1710_GetPWMInitialisation(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_PWM, PBYTE pb_TimingUnit, @@ -50,10 +50,10 @@ INT i_APCI1710_GetPWMInitialisation(comedi_device *dev, PBYTE pb_ExternGate, PBYTE pb_InterruptEnable, PBYTE pb_Enable); -INT i_APCI1710_InsnWritePWM(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnWritePWM(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_EnablePWM(comedi_device *dev, +INT i_APCI1710_EnablePWM(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_PWM, BYTE b_StartLevel, @@ -61,16 +61,16 @@ INT i_APCI1710_EnablePWM(comedi_device *dev, BYTE b_StopLevel, BYTE b_ExternGate, BYTE b_InterruptEnable); -INT i_APCI1710_SetNewPWMTiming(comedi_device *dev, +INT i_APCI1710_SetNewPWMTiming(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_PWM, BYTE b_TimingUnit, ULONG ul_LowTiming, ULONG ul_HighTiming); -INT i_APCI1710_DisablePWM(comedi_device *dev, BYTE b_ModulNbr, BYTE b_PWM); +INT i_APCI1710_DisablePWM(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_PWM); -INT i_APCI1710_InsnReadGetPWMStatus(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InsnBitsReadPWMInterrupt(comedi_device *dev, +INT i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c index 650b5752e61a..de2b158698f6 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c @@ -133,7 +133,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnConfigInitSSI(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -362,7 +362,7 @@ INT i_APCI1710_InsnConfigInitSSI(comedi_device * dev, comedi_subdevice * s, | BYTE_ b_SelectedSSI, | | PULONG_ pul_Position, | | PULONG_ pul_TurnCpt) - INT i_APCI1710_ReadSSIValue(comedi_device *dev,comedi_subdevice *s, + INT i_APCI1710_ReadSSIValue(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : @@ -400,7 +400,7 @@ pul_Position = (PULONG) &data[0]; +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnReadSSIValue(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -735,7 +735,7 @@ INT i_APCI1710_InsnReadSSIValue(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnBitsSSIDigitalIO(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h index a0ad47d2f7a8..2a631b8163c4 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h @@ -33,11 +33,11 @@ /* * SSI INISIALISATION FUNCTION */ -INT i_APCI1710_InsnConfigInitSSI(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnConfigInitSSI(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InsnReadSSIValue(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InsnBitsSSIDigitalIO(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c index 09d5a2fadee6..a9cad8066a54 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c @@ -130,7 +130,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnConfigInitTorCounter(comedi_device * dev, +INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -987,7 +987,7 @@ INT i_APCI1710_InsnConfigInitTorCounter(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnWriteEnableDisableTorCounter(comedi_device * dev, +INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -1460,7 +1460,7 @@ INT i_APCI1710_InsnWriteEnableDisableTorCounter(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnReadGetTorCounterInitialisation(comedi_device * dev, +INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -1700,7 +1700,7 @@ INT i_APCI1710_InsnReadGetTorCounterInitialisation(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(comedi_device * dev, +INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h index a4807de42441..80d100a9bc92 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h @@ -35,23 +35,23 @@ /* * TOR_COUNTER INISIALISATION FUNCTION */ -INT i_APCI1710_InsnConfigInitTorCounter(comedi_device *dev, +INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InsnWriteEnableDisableTorCounter(comedi_device *dev, +INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InsnReadGetTorCounterInitialisation(comedi_device *dev, +INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /* * TOR_COUNTER READ FUNCTION */ -INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(comedi_device *dev, +INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c index 0a40f46442e9..9932fc1fa55f 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c @@ -100,7 +100,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnConfigInitTTLIO(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -406,7 +406,7 @@ APCI1710_TTL_READCHANNEL +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnBitsReadTTLIO(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -655,7 +655,7 @@ INT i_APCI1710_InsnBitsReadTTLIO(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnReadTTLIOAllPortValue(comedi_device * dev, +INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -792,7 +792,7 @@ INT i_APCI1710_InsnReadTTLIOAllPortValue(comedi_device * dev, | (BYTE_ b_BoardHandle, | | BYTE_ b_ModulNbr, | | BYTE_ b_OutputChannel) -INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(comedi_device *dev,comedi_subdevice *s, +INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Sets or resets the output witch has been passed with the | @@ -825,7 +825,7 @@ INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(comedi_device *dev,comedi_subdevice *s, +----------------------------------------------------------------------------+ */ -INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(comedi_device * dev, +INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h index 8993ac642736..d0bde4bb809a 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h @@ -24,21 +24,21 @@ /* * TTL INISIALISATION FUNCTION */ -INT i_APCI1710_InsnConfigInitTTLIO(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /* * TTL INPUT FUNCTION */ -INT i_APCI1710_InsnBitsReadTTLIO(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1710_InsnReadTTLIOAllPortValue(comedi_device *dev, +INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /* * TTL OUTPUT FUNCTIONS */ -INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(comedi_device *dev, +INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c index 4cd552568ac3..1e091eca8019 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c @@ -2541,7 +2541,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl); /* +----------------------------------------------------------------------------+ -| Function name :static int i_ADDI_Attach(comedi_device *dev, | +| Function name :static int i_ADDI_Attach(struct comedi_device *dev, | | comedi_devconfig *it) | | | +----------------------------------------------------------------------------+ @@ -2550,7 +2550,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl); | This function does all the initializations and memory | | allocation of data structures for the driver. | +----------------------------------------------------------------------------+ -| Input Parameters :comedi_device *dev | +| Input Parameters :struct comedi_device *dev | | comedi_devconfig *it | | | +----------------------------------------------------------------------------+ @@ -2559,7 +2559,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl); +----------------------------------------------------------------------------+ */ -static int i_ADDI_Attach(comedi_device * dev, comedi_devconfig * it) +static int i_ADDI_Attach(struct comedi_device * dev, comedi_devconfig * it) { comedi_subdevice *s; int ret, pages, i, n_subdevices; @@ -2909,7 +2909,7 @@ static int i_ADDI_Attach(comedi_device * dev, comedi_devconfig * it) /* +----------------------------------------------------------------------------+ -| Function name : static int i_ADDI_Detach(comedi_device *dev) | +| Function name : static int i_ADDI_Detach(struct comedi_device *dev) | | | | | +----------------------------------------------------------------------------+ @@ -2917,7 +2917,7 @@ static int i_ADDI_Attach(comedi_device * dev, comedi_devconfig * it) | Free the DMA buffers, unregister irq. | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | | | | +----------------------------------------------------------------------------+ @@ -2926,7 +2926,7 @@ static int i_ADDI_Attach(comedi_device * dev, comedi_devconfig * it) +----------------------------------------------------------------------------+ */ -static int i_ADDI_Detach(comedi_device * dev) +static int i_ADDI_Detach(struct comedi_device * dev) { if (dev->private) { @@ -2976,14 +2976,14 @@ static int i_ADDI_Detach(comedi_device * dev) /* +----------------------------------------------------------------------------+ -| Function name : static int i_ADDI_Reset(comedi_device *dev) | +| Function name : static int i_ADDI_Reset(struct comedi_device *dev) | | | +----------------------------------------------------------------------------+ | Task : Disables all interrupts, Resets digital output to low, | | Set all analog output to low | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | | | | +----------------------------------------------------------------------------+ @@ -2992,7 +2992,7 @@ static int i_ADDI_Detach(comedi_device * dev) +----------------------------------------------------------------------------+ */ -static int i_ADDI_Reset(comedi_device * dev) +static int i_ADDI_Reset(struct comedi_device * dev) { this_board->i_hwdrv_Reset(dev); @@ -3020,7 +3020,7 @@ static int i_ADDI_Reset(comedi_device * dev) static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG) { - comedi_device *dev = d; + struct comedi_device *dev = d; this_board->v_hwdrv_Interrupt(irq, d); return IRQ_RETVAL(1); } @@ -3029,14 +3029,14 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG) /* +----------------------------------------------------------------------------+ | Function name : | -|INT i_ADDIDATA_InsnReadEeprom(comedi_device *dev,comedi_subdevice *s, +|INT i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | | +----------------------------------------------------------------------------+ | Task : Read 256 words from EEPROM | | | +----------------------------------------------------------------------------+ -| Input Parameters :(comedi_device *dev,comedi_subdevice *s, +| Input Parameters :(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | | | | | @@ -3046,7 +3046,7 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG) +----------------------------------------------------------------------------+ */ -static int i_ADDIDATA_InsnReadEeprom(comedi_device * dev, comedi_subdevice * s, +static int i_ADDIDATA_InsnReadEeprom(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { WORD w_Data; diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h index ca7c5cb4dac6..9f3aa717b403 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h @@ -112,108 +112,108 @@ typedef struct { /* interrupt and reset */ void (*v_hwdrv_Interrupt)(int irq, void *d); - int (*i_hwdrv_Reset)(comedi_device *dev); + int (*i_hwdrv_Reset)(struct comedi_device *dev); /* Subdevice functions */ /* ANALOG INPUT */ - int (*i_hwdrv_InsnConfigAnalogInput)(comedi_device *dev, + int (*i_hwdrv_InsnConfigAnalogInput)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnReadAnalogInput)(comedi_device *dev, + int (*i_hwdrv_InsnReadAnalogInput)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnWriteAnalogInput)(comedi_device *dev, + int (*i_hwdrv_InsnWriteAnalogInput)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnBitsAnalogInput)(comedi_device *dev, + int (*i_hwdrv_InsnBitsAnalogInput)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_CommandTestAnalogInput)(comedi_device *dev, + int (*i_hwdrv_CommandTestAnalogInput)(struct comedi_device *dev, comedi_subdevice *s, comedi_cmd *cmd); - int (*i_hwdrv_CommandAnalogInput)(comedi_device *dev, + int (*i_hwdrv_CommandAnalogInput)(struct comedi_device *dev, comedi_subdevice *s); - int (*i_hwdrv_CancelAnalogInput)(comedi_device *dev, + int (*i_hwdrv_CancelAnalogInput)(struct comedi_device *dev, comedi_subdevice *s); /* Analog Output */ - int (*i_hwdrv_InsnConfigAnalogOutput)(comedi_device *dev, + int (*i_hwdrv_InsnConfigAnalogOutput)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnWriteAnalogOutput)(comedi_device *dev, + int (*i_hwdrv_InsnWriteAnalogOutput)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnBitsAnalogOutput)(comedi_device *dev, + int (*i_hwdrv_InsnBitsAnalogOutput)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /* Digital Input */ - int (*i_hwdrv_InsnConfigDigitalInput) (comedi_device *dev, + int (*i_hwdrv_InsnConfigDigitalInput) (struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnReadDigitalInput) (comedi_device *dev, + int (*i_hwdrv_InsnReadDigitalInput) (struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnWriteDigitalInput) (comedi_device *dev, + int (*i_hwdrv_InsnWriteDigitalInput) (struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnBitsDigitalInput) (comedi_device *dev, + int (*i_hwdrv_InsnBitsDigitalInput) (struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /* Digital Output */ - int (*i_hwdrv_InsnConfigDigitalOutput)(comedi_device *dev, + int (*i_hwdrv_InsnConfigDigitalOutput)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnWriteDigitalOutput)(comedi_device *dev, + int (*i_hwdrv_InsnWriteDigitalOutput)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnBitsDigitalOutput)(comedi_device *dev, + int (*i_hwdrv_InsnBitsDigitalOutput)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnReadDigitalOutput)(comedi_device *dev, + int (*i_hwdrv_InsnReadDigitalOutput)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /* TIMER */ - int (*i_hwdrv_InsnConfigTimer)(comedi_device *dev, + int (*i_hwdrv_InsnConfigTimer)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnWriteTimer)(comedi_device *dev, + int (*i_hwdrv_InsnWriteTimer)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnReadTimer)(comedi_device *dev, comedi_subdevice *s, + int (*i_hwdrv_InsnReadTimer)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdrv_InsnBitsTimer)(comedi_device *dev, comedi_subdevice *s, + int (*i_hwdrv_InsnBitsTimer)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /* TTL IO */ - int (*i_hwdr_ConfigInitTTLIO)(comedi_device *dev, + int (*i_hwdr_ConfigInitTTLIO)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdr_ReadTTLIOBits)(comedi_device *dev, comedi_subdevice *s, + int (*i_hwdr_ReadTTLIOBits)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdr_ReadTTLIOAllPortValue)(comedi_device *dev, + int (*i_hwdr_ReadTTLIOAllPortValue)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); - int (*i_hwdr_WriteTTLIOChlOnOff)(comedi_device *dev, + int (*i_hwdr_WriteTTLIOChlOnOff)(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); } boardtype; @@ -456,10 +456,10 @@ typedef struct { static unsigned short pci_list_builded; /* set to 1 when list of card is known */ /* Function declarations */ -static int i_ADDI_Attach(comedi_device *dev, comedi_devconfig *it); -static int i_ADDI_Detach(comedi_device *dev); -static int i_ADDI_Reset(comedi_device *dev); +static int i_ADDI_Attach(struct comedi_device *dev, comedi_devconfig *it); +static int i_ADDI_Detach(struct comedi_device *dev); +static int i_ADDI_Reset(struct comedi_device *dev); static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG); -static int i_ADDIDATA_InsnReadEeprom(comedi_device *dev, comedi_subdevice *s, +static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c index b8fa5c9071a6..bf83af20f489 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c @@ -121,7 +121,7 @@ typedef struct { /*****************************************/ INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, - PCHAR pc_PCIChipInformation, comedi_device * dev); + PCHAR pc_PCIChipInformation, struct comedi_device *dev); INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress, PCHAR pc_PCIChipInformation, WORD w_Address, @@ -787,7 +787,7 @@ VOID v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value) /* +----------------------------------------------------------------------------+ | Function Name : INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, | -| PCHAR pc_PCIChipInformation,comedi_device *dev) | +| PCHAR pc_PCIChipInformation,struct comedi_device *dev) | +----------------------------------------------------------------------------+ | Task : Read from eeprom Main Header | +----------------------------------------------------------------------------+ @@ -795,7 +795,7 @@ VOID v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value) | | | PCHAR pc_PCIChipInformation : PCI Chip Type. | | | -| comedi_device *dev : comedi device structure | +| struct comedi_device *dev : comedi device structure | | pointer | +----------------------------------------------------------------------------+ | Output Parameters : - | @@ -805,7 +805,7 @@ VOID v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value) */ INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, - PCHAR pc_PCIChipInformation, comedi_device * dev) + PCHAR pc_PCIChipInformation, struct comedi_device *dev) { WORD w_Temp, i, w_Count = 0; UINT ui_Temp; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c index e18d085bbd6b..7d6a6e05cdbc 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c @@ -56,7 +56,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc #include "APCI1710_Pwm.c" #include "APCI1710_INCCPT.c" -void i_ADDI_AttachPCI1710(comedi_device * dev) +void i_ADDI_AttachPCI1710(struct comedi_device * dev) { comedi_subdevice *s; int ret = 0; @@ -195,11 +195,11 @@ void i_ADDI_AttachPCI1710(comedi_device * dev) s->insn_bits = i_APCI1710_InsnBitsINCCPT; } -int i_APCI1710_Reset(comedi_device * dev); +int i_APCI1710_Reset(struct comedi_device * dev); VOID v_APCI1710_Interrupt(int irq, void *d); //for 1710 -int i_APCI1710_Reset(comedi_device * dev) +int i_APCI1710_Reset(struct comedi_device * dev) { int ret; DWORD dw_Dummy; @@ -249,7 +249,7 @@ int i_APCI1710_Reset(comedi_device * dev) VOID v_APCI1710_Interrupt(int irq, void *d) { - comedi_device *dev = d; + struct comedi_device *dev = d; BYTE b_ModuleCpt = 0; BYTE b_InterruptFlag = 0; BYTE b_PWMCpt = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c index 4a4356550a6c..599c7c3b68f7 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c @@ -58,12 +58,12 @@ INT i_Flag = 1; /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI035_ConfigTimerWatchdog | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -109,7 +109,7 @@ INT i_Flag = 1; | | +----------------------------------------------------------------------------+ */ -INT i_APCI035_ConfigTimerWatchdog(comedi_device * dev, comedi_subdevice * s, +INT i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Status = 0; @@ -254,12 +254,12 @@ INT i_APCI035_ConfigTimerWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI035_StartStopWriteTimerWatchdog | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Start / Stop The Selected Timer , or Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -278,7 +278,7 @@ INT i_APCI035_ConfigTimerWatchdog(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI035_StartStopWriteTimerWatchdog(comedi_device * dev, +INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Command = 0; @@ -367,12 +367,12 @@ INT i_APCI035_StartStopWriteTimerWatchdog(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI035_ReadTimerWatchdog | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read The Selected Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -391,7 +391,7 @@ INT i_APCI035_StartStopWriteTimerWatchdog(comedi_device * dev, | | +----------------------------------------------------------------------------+ */ -INT i_APCI035_ReadTimerWatchdog(comedi_device * dev, comedi_subdevice * s, +INT i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Status = 0; // Status register @@ -427,12 +427,12 @@ INT i_APCI035_ReadTimerWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI035_ConfigAnalogInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Analog Input Subdevice | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s : Subdevice Pointer | | comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | @@ -447,7 +447,7 @@ INT i_APCI035_ReadTimerWatchdog(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI035_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI035_ConfigAnalogInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { devpriv->tsk_Current = current; @@ -466,12 +466,12 @@ INT i_APCI035_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI035_ReadAnalogInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To read | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -484,7 +484,7 @@ INT i_APCI035_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI035_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI035_ReadAnalogInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_CommandRegister = 0; @@ -506,7 +506,7 @@ INT i_APCI035_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI035_Reset(comedi_device *dev) | +| Function Name : int i_APCI035_Reset(struct comedi_device *dev) | | | +----------------------------------------------------------------------------+ | Task :Resets the registers of the card | @@ -519,7 +519,7 @@ INT i_APCI035_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI035_Reset(comedi_device * dev) +INT i_APCI035_Reset(struct comedi_device * dev) { INT i_Count = 0; for (i_Count = 1; i_Count <= 4; i_Count++) { @@ -550,7 +550,7 @@ INT i_APCI035_Reset(comedi_device * dev) */ static void v_APCI035_Interrupt(int irq, void *d) { - comedi_device *dev = d; + struct comedi_device *dev = d; UINT ui_StatusRegister1 = 0; UINT ui_StatusRegister2 = 0; UINT ui_ReadCommand = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h index 0e4ec157ad3a..c0330d8a3137 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h @@ -101,23 +101,23 @@ comedi_lrange range_apci035_ai = { 8, { /* TIMER */ /* timer value is passed as u seconds */ -INT i_APCI035_ConfigTimerWatchdog(comedi_device *dev, comedi_subdevice *s, +INT i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI035_StartStopWriteTimerWatchdog(comedi_device *dev, +INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI035_ReadTimerWatchdog(comedi_device *dev, comedi_subdevice *s, +INT i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /* Temperature Related Defines (Analog Input Subdevice) */ -INT i_APCI035_ConfigAnalogInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI035_ConfigAnalogInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI035_ReadAnalogInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI035_ReadAnalogInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /* Interrupt */ static void v_APCI035_Interrupt(int irq, void *d); /* Reset functions */ -INT i_APCI035_Reset(comedi_device *dev); +INT i_APCI035_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c index 5f65d1d4baab..bdfe5e95eb61 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c @@ -59,12 +59,12 @@ UINT ui_InterruptStatus = 0; /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1032_ConfigDigitalInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures the digital input Subdevice | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | | @@ -84,7 +84,7 @@ UINT ui_InterruptStatus = 0; +----------------------------------------------------------------------------+ */ -INT i_APCI1032_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_TmpValue; @@ -128,12 +128,12 @@ INT i_APCI1032_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1032_Read1DigitalInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the digital input | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_Channel : Channel number to read | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -144,7 +144,7 @@ INT i_APCI1032_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI1032_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_TmpValue = 0; @@ -166,12 +166,12 @@ INT i_APCI1032_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1032_ReadMoreDigitalInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the Requested digital inputs | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To be Read | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -183,7 +183,7 @@ INT i_APCI1032_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1032_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_PortValue = data[0]; @@ -245,7 +245,7 @@ INT i_APCI1032_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, */ static VOID v_APCI1032_Interrupt(int irq, void *d) { - comedi_device *dev = d; + struct comedi_device *dev = d; UINT ui_Temp; //disable the interrupt @@ -262,11 +262,11 @@ static VOID v_APCI1032_Interrupt(int irq, void *d) /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI1032_Reset(comedi_device *dev) | | +| Function Name : int i_APCI1032_Reset(struct comedi_device *dev) | | +----------------------------------------------------------------------------+ | Task :resets all the registers | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev +| Input Parameters : struct comedi_device *dev +----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ @@ -275,7 +275,7 @@ static VOID v_APCI1032_Interrupt(int irq, void *d) +----------------------------------------------------------------------------+ */ -INT i_APCI1032_Reset(comedi_device * dev) +INT i_APCI1032_Reset(struct comedi_device * dev) { outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ); //disable the interrupts inl(devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_STATUS); //Reset the interrupt status register diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h index 51abd4f073de..cb96ff1778c5 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h @@ -47,17 +47,17 @@ //DI // for di read -INT i_APCI1032_ConfigDigitalInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1032_Read1DigitalInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1032_Read1DigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1032_ReadMoreDigitalInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); // Interrupt functions..... static VOID v_APCI1032_Interrupt(int irq, void *d); //Reset -INT i_APCI1032_Reset(comedi_device *dev); +INT i_APCI1032_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c index 33885c55be9d..9a786c9060b6 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c @@ -61,7 +61,7 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled = /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ConfigDigitalInputEvent | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : An event can be generated for each port. | @@ -70,7 +70,7 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled = | (port 2). An interrupt is generated when one or both | | events have occurred | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | | @@ -137,7 +137,7 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled = +----------------------------------------------------------------------------+ */ -INT i_APCI1500_ConfigDigitalInputEvent(comedi_device * dev, +INT i_APCI1500_ConfigDigitalInputEvent(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int i_PatternPolarity = 0, i_PatternTransition = 0, i_PatternMask = 0; @@ -500,12 +500,12 @@ INT i_APCI1500_ConfigDigitalInputEvent(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_StartStopInputEvent | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Allows or disallows a port event | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_Channel : Channel number to read | | unsigned int *data : Data Pointer to read status | data[0] :0 Start input event @@ -519,7 +519,7 @@ INT i_APCI1500_ConfigDigitalInputEvent(comedi_device * dev, | | +----------------------------------------------------------------------------+ */ -int i_APCI1500_StartStopInputEvent(comedi_device * dev, comedi_subdevice * s, +int i_APCI1500_StartStopInputEvent(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int i_Event1InterruptStatus = 0, i_Event2InterruptStatus = @@ -768,12 +768,12 @@ int i_APCI1500_StartStopInputEvent(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_Initialisation | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the digital input | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_Channel : Channel number to read | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -784,7 +784,7 @@ int i_APCI1500_StartStopInputEvent(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI1500_Initialisation(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1500_Initialisation(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int i_DummyRead = 0; @@ -937,12 +937,12 @@ INT i_APCI1500_Initialisation(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ReadMoreDigitalInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the Requested digital inputs | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To be Read | | UINT *data : Data Pointer data[0] : 0 Read a single channel @@ -957,7 +957,7 @@ INT i_APCI1500_Initialisation(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1500_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1500_ReadMoreDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_PortValue = data[1]; @@ -1015,14 +1015,14 @@ INT i_APCI1500_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ConfigDigitalOutputErrorInterrupt - (comedi_device *dev,comedi_subdevice *s comedi_insn + (struct comedi_device *dev,comedi_subdevice *s comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Configures the digital output memory and the digital output error interrupt | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | comedi_subdevice *s, :pointer to subdevice structure @@ -1040,7 +1040,7 @@ INT i_APCI1500_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -int i_APCI1500_ConfigDigitalOutputErrorInterrupt(comedi_device * dev, +int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { devpriv->b_OutputMemoryStatus = data[0]; @@ -1050,12 +1050,12 @@ int i_APCI1500_ConfigDigitalOutputErrorInterrupt(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_WriteDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes port value To the selected port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To Write | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -1067,7 +1067,7 @@ int i_APCI1500_ConfigDigitalOutputErrorInterrupt(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI1500_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1500_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { static UINT ui_Temp = 0; @@ -1220,7 +1220,7 @@ INT i_APCI1500_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ | Task : Configures The Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status data[0] : 2 APCI1500_1_8_KHZ @@ -1261,7 +1261,7 @@ INT i_APCI1500_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device * dev, +int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int i_TimerCounterMode, i_MasterConfiguration; @@ -1835,12 +1835,12 @@ int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_StartStopTriggerTimerCounterWatchdog | -| (comedi_device *dev,comedi_subdevice *s, +| (struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Start / Stop or trigger the timer counter or Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -1860,7 +1860,7 @@ int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device * dev, | | +----------------------------------------------------------------------------+ */ -int i_APCI1500_StartStopTriggerTimerCounterWatchdog(comedi_device * dev, +int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int i_CommandAndStatusValue; @@ -2160,12 +2160,12 @@ int i_APCI1500_StartStopTriggerTimerCounterWatchdog(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ReadCounterTimerWatchdog | -| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Read The Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -2182,7 +2182,7 @@ int i_APCI1500_StartStopTriggerTimerCounterWatchdog(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI1500_ReadCounterTimerWatchdog(comedi_device * dev, +int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { int i_CommandAndStatusValue; @@ -2351,12 +2351,12 @@ int i_APCI1500_ReadCounterTimerWatchdog(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ReadInterruptMask | -| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Read the interrupt mask | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -2370,7 +2370,7 @@ int i_APCI1500_ReadCounterTimerWatchdog(comedi_device * dev, | | +----------------------------------------------------------------------------+ */ -int i_APCI1500_ReadInterruptMask(comedi_device * dev, comedi_subdevice * s, +int i_APCI1500_ReadInterruptMask(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { data[0] = i_InterruptMask; @@ -2382,12 +2382,12 @@ int i_APCI1500_ReadInterruptMask(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ConfigureInterrupt | -| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Configures the interrupt registers | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer | @@ -2401,7 +2401,7 @@ int i_APCI1500_ReadInterruptMask(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -int i_APCI1500_ConfigureInterrupt(comedi_device * dev, comedi_subdevice * s, +int i_APCI1500_ConfigureInterrupt(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Status; @@ -2579,7 +2579,7 @@ int i_APCI1500_ConfigureInterrupt(comedi_device * dev, comedi_subdevice * s, static VOID v_APCI1500_Interrupt(int irq, void *d) { - comedi_device *dev = d; + struct comedi_device *dev = d; UINT ui_InterruptStatus = 0; int i_RegValue = 0; i_InterruptMask = 0; @@ -2809,11 +2809,11 @@ static VOID v_APCI1500_Interrupt(int irq, void *d) /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI1500_Reset(comedi_device *dev) | | +| Function Name : int i_APCI1500_Reset(struct comedi_device *dev) | | +----------------------------------------------------------------------------+ | Task :resets all the registers | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev +| Input Parameters : struct comedi_device *dev +----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ @@ -2822,7 +2822,7 @@ static VOID v_APCI1500_Interrupt(int irq, void *d) +----------------------------------------------------------------------------+ */ -INT i_APCI1500_Reset(comedi_device * dev) +INT i_APCI1500_Reset(struct comedi_device * dev) { int i_DummyRead = 0; i_TimerCounter1Init = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h index f1519e70cfbc..dc3f3ea78b0f 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h @@ -116,50 +116,50 @@ enum { }; /*----------DIGITAL INPUT----------------*/ -static int i_APCI1500_Initialisation(comedi_device *dev, comedi_subdevice *s, +static int i_APCI1500_Initialisation(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -static int i_APCI1500_ConfigDigitalInputEvent(comedi_device *dev, +static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -static int i_APCI1500_StartStopInputEvent(comedi_device *dev, +static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -static int i_APCI1500_ReadMoreDigitalInput(comedi_device *dev, +static int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /*---------- DIGITAL OUTPUT------------*/ -static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(comedi_device *dev, +static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -static int i_APCI1500_WriteDigitalOutput(comedi_device *dev, +static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /*----------TIMER----------------*/ -static int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device *dev, +static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(comedi_device *dev, +static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -static int i_APCI1500_ReadCounterTimerWatchdog(comedi_device *dev, +static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -static int i_APCI1500_ReadInterruptMask(comedi_device *dev, +static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /*----------INTERRUPT HANDLER------*/ static void v_APCI1500_Interrupt(int irq, void *d); -static int i_APCI1500_ConfigureInterrupt(comedi_device *dev, +static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); /*----------RESET---------------*/ -static int i_APCI1500_Reset(comedi_device *dev); +static int i_APCI1500_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c index 5be566eda898..5ad419b9fa8e 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c @@ -56,12 +56,12 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_Read1DigitalInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the digital input | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -73,7 +73,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | | +----------------------------------------------------------------------------+ */ -INT i_APCI1516_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1516_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_TmpValue = 0; @@ -96,12 +96,12 @@ INT i_APCI1516_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_ReadMoreDigitalInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the Requested digital inputs | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -114,7 +114,7 @@ INT i_APCI1516_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1516_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1516_ReadMoreDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -148,13 +148,13 @@ INT i_APCI1516_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI1516_ConfigDigitalOutput (comedi_device *dev, +| Function Name : int i_APCI1516_ConfigDigitalOutput (struct comedi_device *dev, comedi_subdevice *s comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | comedi_subdevice *s, :pointer to subdevice structure @@ -171,7 +171,7 @@ INT i_APCI1516_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -int i_APCI1516_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, +int i_APCI1516_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { devpriv->b_OutputMemoryStatus = data[0]; @@ -181,12 +181,12 @@ int i_APCI1516_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_WriteDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes port value To the selected port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -199,7 +199,7 @@ int i_APCI1516_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1516_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1516_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp, ui_Temp1; @@ -341,12 +341,12 @@ INT i_APCI1516_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_ReadDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -359,7 +359,7 @@ INT i_APCI1516_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1516_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1516_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -400,13 +400,13 @@ INT i_APCI1516_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI1516_ConfigWatchdog(comedi_device *dev, +| Function Name : int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Configures The Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -419,7 +419,7 @@ INT i_APCI1516_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI1516_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, +int i_APCI1516_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { if (data[0] == 0) { @@ -447,12 +447,12 @@ int i_APCI1516_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_StartStopWriteWatchdog | - | (comedi_device *dev,comedi_subdevice *s, + | (struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Start / Stop The Watchdog | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -465,7 +465,7 @@ int i_APCI1516_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI1516_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, +int i_APCI1516_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { switch (data[0]) { @@ -492,12 +492,12 @@ int i_APCI1516_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_ReadWatchdog | -| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Read The Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -510,7 +510,7 @@ int i_APCI1516_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI1516_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, +int i_APCI1516_ReadWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { data[0] = inw(devpriv->i_IobaseAddon + APCI1516_WATCHDOG_STATUS) & 0x1; @@ -519,11 +519,11 @@ int i_APCI1516_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI1516_Reset(comedi_device *dev) | | +| Function Name : int i_APCI1516_Reset(struct comedi_device *dev) | | +----------------------------------------------------------------------------+ | Task :resets all the registers | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev +| Input Parameters : struct comedi_device *dev +----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ @@ -532,7 +532,7 @@ int i_APCI1516_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI1516_Reset(comedi_device * dev) +INT i_APCI1516_Reset(struct comedi_device * dev) { outw(0x0, devpriv->iobase + APCI1516_DIGITAL_OP); //RESETS THE DIGITAL OUTPUTS outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_ENABLEDISABLE); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h index 176e4785819e..b166257775ce 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h @@ -38,27 +38,27 @@ // Hardware Layer functions for Apci1516 //Digital Input -INT i_APCI1516_ReadMoreDigitalInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1516_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1516_Read1DigitalInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1516_Read1DigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //Digital Output -int i_APCI1516_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s, +int i_APCI1516_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1516_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1516_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1516_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); // TIMER // timer value is passed as u seconds -int i_APCI1516_ConfigWatchdog(comedi_device *dev, comedi_subdevice *s, +int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI1516_StartStopWriteWatchdog(comedi_device *dev, comedi_subdevice *s, +int i_APCI1516_StartStopWriteWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI1516_ReadWatchdog(comedi_device *dev, comedi_subdevice *s, +int i_APCI1516_ReadWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //reset -INT i_APCI1516_Reset(comedi_device *dev); +INT i_APCI1516_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c index cb7510930626..44b4965d8ecc 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c @@ -62,12 +62,12 @@ UINT ui_InterruptData, ui_Type; /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ConfigDigitalInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures the digital input Subdevice | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | | @@ -86,7 +86,7 @@ UINT ui_InterruptData, ui_Type; | | +----------------------------------------------------------------------------+ */ -INT i_APCI1564_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1564_ConfigDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { devpriv->tsk_Current = current; @@ -131,12 +131,12 @@ INT i_APCI1564_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_Read1DigitalInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the digital input | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_Channel : Channel number to read | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -147,7 +147,7 @@ INT i_APCI1564_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI1564_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1564_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_TmpValue = 0; @@ -171,12 +171,12 @@ INT i_APCI1564_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ReadMoreDigitalInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the Requested digital inputs | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To be Read | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -187,7 +187,7 @@ INT i_APCI1564_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI1564_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1564_ReadMoreDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_PortValue = data[0]; @@ -233,12 +233,12 @@ INT i_APCI1564_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ConfigDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -255,7 +255,7 @@ INT i_APCI1564_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI1564_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1564_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { ULONG ul_Command = 0; @@ -296,12 +296,12 @@ INT i_APCI1564_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_WriteDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes port value To the selected port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To Write | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -312,7 +312,7 @@ INT i_APCI1564_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI1564_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1564_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp, ui_Temp1; @@ -470,12 +470,12 @@ INT i_APCI1564_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ReadDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To read | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -486,7 +486,7 @@ INT i_APCI1564_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI1564_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI1564_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp; @@ -537,12 +537,12 @@ INT i_APCI1564_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ConfigTimerCounterWatchdog | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -564,7 +564,7 @@ INT i_APCI1564_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI1564_ConfigTimerCounterWatchdog(comedi_device * dev, +INT i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { ULONG ul_Command1 = 0; @@ -695,12 +695,12 @@ INT i_APCI1564_ConfigTimerCounterWatchdog(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_StartStopWriteTimerCounterWatchdog | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Start / Stop The Selected Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -718,7 +718,7 @@ INT i_APCI1564_ConfigTimerCounterWatchdog(comedi_device * dev, | | +----------------------------------------------------------------------------+ */ -INT i_APCI1564_StartStopWriteTimerCounterWatchdog(comedi_device * dev, +INT i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { ULONG ul_Command1 = 0; @@ -795,12 +795,12 @@ INT i_APCI1564_StartStopWriteTimerCounterWatchdog(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ReadTimerCounterWatchdog | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read The Selected Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -813,7 +813,7 @@ INT i_APCI1564_StartStopWriteTimerCounterWatchdog(comedi_device * dev, | | +----------------------------------------------------------------------------+ */ -INT i_APCI1564_ReadTimerCounterWatchdog(comedi_device * dev, +INT i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { ULONG ul_Command1 = 0; @@ -878,7 +878,7 @@ INT i_APCI1564_ReadTimerCounterWatchdog(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ReadInterruptStatus | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task :Reads the interrupt status register | @@ -892,7 +892,7 @@ INT i_APCI1564_ReadTimerCounterWatchdog(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI1564_ReadInterruptStatus(comedi_device * dev, comedi_subdevice * s, +int i_APCI1564_ReadInterruptStatus(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { *data = ui_Type; @@ -918,7 +918,7 @@ int i_APCI1564_ReadInterruptStatus(comedi_device * dev, comedi_subdevice * s, */ static VOID v_APCI1564_Interrupt(int irq, void *d) { - comedi_device *dev = d; + struct comedi_device *dev = d; UINT ui_DO, ui_DI; UINT ui_Timer; UINT ui_C1, ui_C2, ui_C3, ui_C4; @@ -1068,11 +1068,11 @@ static VOID v_APCI1564_Interrupt(int irq, void *d) /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI1564_Reset(comedi_device *dev) | | +| Function Name : int i_APCI1564_Reset(struct comedi_device *dev) | | +----------------------------------------------------------------------------+ | Task :resets all the registers | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev +| Input Parameters : struct comedi_device *dev +----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ @@ -1081,7 +1081,7 @@ static VOID v_APCI1564_Interrupt(int irq, void *d) +----------------------------------------------------------------------------+ */ -INT i_APCI1564_Reset(comedi_device * dev) +INT i_APCI1564_Reset(struct comedi_device * dev) { outl(0x0, devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_IRQ); //disable the interrupts inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_INTERRUPT_STATUS); //Reset the interrupt status register diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h index 914231f2edb6..4b40da7879de 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h @@ -82,33 +82,33 @@ //DI // for di read -INT i_APCI1564_ConfigDigitalInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1564_ConfigDigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1564_Read1DigitalInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1564_Read1DigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1564_ReadMoreDigitalInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1564_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //DO -int i_APCI1564_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s, +int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1564_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1564_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI1564_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI1564_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI1564_ReadInterruptStatus(comedi_device *dev, comedi_subdevice *s, +int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); // TIMER // timer value is passed as u seconds -INT i_APCI1564_ConfigTimerCounterWatchdog(comedi_device *dev, +INT i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI1564_StartStopWriteTimerCounterWatchdog(comedi_device *dev, +int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI1564_ReadTimerCounterWatchdog(comedi_device *dev, +int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); @@ -116,4 +116,4 @@ int i_APCI1564_ReadTimerCounterWatchdog(comedi_device *dev, static VOID v_APCI1564_Interrupt(int irq, void *d); // RESET -INT i_APCI1564_Reset(comedi_device *dev); +INT i_APCI1564_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c index 0955fdf31cd1..74b0bd484bde 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c @@ -58,7 +58,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI16XX_InsnConfigInitTTLIO | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -90,7 +90,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ */ -int i_APCI16XX_InsnConfigInitTTLIO(comedi_device * dev, +int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -251,7 +251,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI16XX_InsnBitsReadTTLIO | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -283,7 +283,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI16XX_InsnBitsReadTTLIO(comedi_device * dev, +int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -411,7 +411,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI16XX_InsnReadTTLIOAllPortValue | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -430,7 +430,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device * dev, +int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { BYTE b_Command = (BYTE) CR_AREF(insn->chanspec); @@ -536,7 +536,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI16XX_InsnBitsWriteTTLIO | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -570,7 +570,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI16XX_InsnBitsWriteTTLIO(comedi_device * dev, +int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -763,10 +763,10 @@ int i_APCI16XX_InsnBitsWriteTTLIO(comedi_device * dev, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI2200_Reset(comedi_device *dev) | +----------------------------------------------------------------------------+ +| Function Name : int i_APCI2200_Reset(struct comedi_device *dev) | +----------------------------------------------------------------------------+ | Task :resets all the registers | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | +----------------------------------------------------------------------------+ | Output Parameters : - | +----------------------------------------------------------------------------+ @@ -774,7 +774,7 @@ int i_APCI16XX_InsnBitsWriteTTLIO(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI16XX_Reset(comedi_device * dev) +int i_APCI16XX_Reset(struct comedi_device * dev) { return 0; } diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h index 6e8d09407807..9f8f2b752431 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h @@ -62,7 +62,7 @@ static const comedi_lrange range_apci16xx_ttl = { 12, +----------------------------------------------------------------------------+ */ -int i_APCI16XX_InsnConfigInitTTLIO(comedi_device *dev, +int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); @@ -72,11 +72,11 @@ int i_APCI16XX_InsnConfigInitTTLIO(comedi_device *dev, +----------------------------------------------------------------------------+ */ -int i_APCI16XX_InsnBitsReadTTLIO(comedi_device *dev, +int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device *dev, +int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); @@ -86,9 +86,9 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device *dev, +----------------------------------------------------------------------------+ */ -int i_APCI16XX_InsnBitsWriteTTLIO(comedi_device *dev, +int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI16XX_Reset(comedi_device *dev); +int i_APCI16XX_Reset(struct comedi_device *dev); #endif diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c index fd4ae6abbb3f..dcb837dee3b1 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c @@ -56,12 +56,12 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2016_ConfigDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -75,7 +75,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | | +----------------------------------------------------------------------------+ */ -int i_APCI2016_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, +int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { if ((data[0] != 0) && (data[0] != 1)) { @@ -95,12 +95,12 @@ int i_APCI2016_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2016_WriteDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes port value To the selected port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To Write | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -111,7 +111,7 @@ int i_APCI2016_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -int i_APCI2016_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_NoOfChannel; @@ -250,12 +250,12 @@ int i_APCI2016_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2016_BitsDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To read | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -266,7 +266,7 @@ int i_APCI2016_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -int i_APCI2016_BitsDigitalOutput(comedi_device * dev, comedi_subdevice * s, +int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp; @@ -320,12 +320,12 @@ int i_APCI2016_BitsDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2016_ConfigWatchdog | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure | | comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -337,7 +337,7 @@ int i_APCI2016_BitsDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -int i_APCI2016_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, +int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -363,12 +363,12 @@ int i_APCI2016_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2016_StartStopWriteWatchdog | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Start / Stop The Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure | | comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -380,7 +380,7 @@ int i_APCI2016_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -int i_APCI2016_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, +int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -409,12 +409,12 @@ int i_APCI2016_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2016_ReadWatchdog | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read The Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure | | comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -427,7 +427,7 @@ int i_APCI2016_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI2016_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, +int i_APCI2016_ReadWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { udelay(5); @@ -437,11 +437,11 @@ int i_APCI2016_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI2016_Reset(comedi_device *dev) | | +| Function Name : int i_APCI2016_Reset(struct comedi_device *dev) | | +----------------------------------------------------------------------------+ | Task :resets all the registers | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev +| Input Parameters : struct comedi_device *dev +----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ @@ -450,7 +450,7 @@ int i_APCI2016_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI2016_Reset(comedi_device * dev) +INT i_APCI2016_Reset(struct comedi_device * dev) { outw(0x0, devpriv->iobase + APCI2016_DIGITAL_OP); // Resets the digital output channels outw(0x0, devpriv->i_IobaseAddon + APCI2016_WATCHDOG_ENABLEDISABLE); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h index 3ca52e9eca5a..765de4212ed0 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h @@ -40,25 +40,25 @@ // Hardware Layer functions for Apci2016 //DO -int i_APCI2016_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s, +int i_APCI2016_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI2016_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, +int i_APCI2016_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI2016_BitsDigitalOutput(comedi_device *dev, comedi_subdevice *s, +int i_APCI2016_BitsDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); // TIMER // timer value is passed as u seconds -int i_APCI2016_ConfigWatchdog(comedi_device *dev, comedi_subdevice *s, +int i_APCI2016_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI2016_StartStopWriteWatchdog(comedi_device *dev, comedi_subdevice *s, +int i_APCI2016_StartStopWriteWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI2016_ReadWatchdog(comedi_device *dev, comedi_subdevice *s, +int i_APCI2016_ReadWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); // Interrupt functions..... @@ -67,4 +67,4 @@ int i_APCI2016_ReadWatchdog(comedi_device *dev, comedi_subdevice *s, //VOID v_APCI2016_Interrupt(int irq, void *d); // RESET -INT i_APCI2016_Reset(comedi_device *dev); +INT i_APCI2016_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c index 4345dda7f99d..b536667398cf 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c @@ -57,12 +57,12 @@ UINT ui_InterruptData, ui_Type; /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2032_ConfigDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -79,7 +79,7 @@ UINT ui_InterruptData, ui_Type; | | +----------------------------------------------------------------------------+ */ -int i_APCI2032_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, +int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { ULONG ul_Command = 0; @@ -117,12 +117,12 @@ int i_APCI2032_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2032_WriteDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes port value To the selected port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To Write | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -134,7 +134,7 @@ int i_APCI2032_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI2032_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp, ui_Temp1; @@ -296,12 +296,12 @@ INT i_APCI2032_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2032_ReadDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To read | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -313,7 +313,7 @@ INT i_APCI2032_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI2032_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp; @@ -368,7 +368,7 @@ INT i_APCI2032_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ | Task : Configures The Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -380,7 +380,7 @@ INT i_APCI2032_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI2032_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, +INT i_APCI2032_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { if (data[0] == 0) { @@ -403,12 +403,12 @@ INT i_APCI2032_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2032_StartStopWriteWatchdog | - | (comedi_device *dev,comedi_subdevice *s, + | (struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Start / Stop The Watchdog | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -421,7 +421,7 @@ INT i_APCI2032_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI2032_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, +int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { switch (data[0]) { @@ -448,12 +448,12 @@ int i_APCI2032_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2032_ReadWatchdog | -| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Read The Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -466,7 +466,7 @@ int i_APCI2032_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI2032_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, +int i_APCI2032_ReadWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -495,7 +495,7 @@ int i_APCI2032_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, */ void v_APCI2032_Interrupt(int irq, void *d) { - comedi_device *dev = d; + struct comedi_device *dev = d; unsigned int ui_DO; ui_DO = inl(devpriv->iobase + APCI2032_DIGITAL_OP_IRQ) & 0x1; //Check if VCC OR CC interrupt has occured. @@ -530,7 +530,7 @@ void v_APCI2032_Interrupt(int irq, void *d) /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2032_ReadInterruptStatus | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task :Reads the interrupt status register | @@ -544,7 +544,7 @@ void v_APCI2032_Interrupt(int irq, void *d) +----------------------------------------------------------------------------+ */ -int i_APCI2032_ReadInterruptStatus(comedi_device * dev, comedi_subdevice * s, +int i_APCI2032_ReadInterruptStatus(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { *data = ui_Type; @@ -553,7 +553,7 @@ int i_APCI2032_ReadInterruptStatus(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI2032_Reset(comedi_device *dev) | +| Function Name : int i_APCI2032_Reset(struct comedi_device *dev) | | | +----------------------------------------------------------------------------+ | Task :Resets the registers of the card | @@ -567,7 +567,7 @@ int i_APCI2032_ReadInterruptStatus(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI2032_Reset(comedi_device * dev) +int i_APCI2032_Reset(struct comedi_device * dev) { devpriv->b_DigitalOutputRegister = 0; ui_Type = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h index 7d858af87979..8ceefb07d503 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h @@ -55,22 +55,22 @@ // Hardware Layer functions for Apci2032 //DO -int i_APCI2032_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s, +int i_APCI2032_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI2032_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI2032_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI2032_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI2032_ReadInterruptStatus(comedi_device *dev, comedi_subdevice *s, +int i_APCI2032_ReadInterruptStatus(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); // TIMER // timer value is passed as u seconds -INT i_APCI2032_ConfigWatchdog(comedi_device *dev, comedi_subdevice *s, +INT i_APCI2032_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI2032_StartStopWriteWatchdog(comedi_device *dev, comedi_subdevice *s, +int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI2032_ReadWatchdog(comedi_device *dev, comedi_subdevice *s, +int i_APCI2032_ReadWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); // Interrupt functions..... @@ -78,4 +78,4 @@ int i_APCI2032_ReadWatchdog(comedi_device *dev, comedi_subdevice *s, void v_APCI2032_Interrupt(int irq, void *d); //Reset functions -int i_APCI2032_Reset(comedi_device *dev); +int i_APCI2032_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c index d61dfd1d1eab..b297f6f96089 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c @@ -56,12 +56,12 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_Read1DigitalInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the digital input | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -73,7 +73,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | | +----------------------------------------------------------------------------+ */ -INT i_APCI2200_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI2200_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_TmpValue = 0; @@ -94,12 +94,12 @@ INT i_APCI2200_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_ReadMoreDigitalInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the Requested digital inputs | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -112,7 +112,7 @@ INT i_APCI2200_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI2200_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI2200_ReadMoreDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -146,13 +146,13 @@ INT i_APCI2200_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI2200_ConfigDigitalOutput (comedi_device *dev, +| Function Name : int i_APCI2200_ConfigDigitalOutput (struct comedi_device *dev, comedi_subdevice *s comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | comedi_subdevice *s, :pointer to subdevice structure @@ -169,7 +169,7 @@ INT i_APCI2200_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -int i_APCI2200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, +int i_APCI2200_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { devpriv->b_OutputMemoryStatus = data[0]; @@ -179,12 +179,12 @@ int i_APCI2200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_WriteDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes port value To the selected port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -197,7 +197,7 @@ int i_APCI2200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI2200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI2200_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp, ui_Temp1; @@ -336,12 +336,12 @@ INT i_APCI2200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_ReadDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -354,7 +354,7 @@ INT i_APCI2200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI2200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI2200_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -399,13 +399,13 @@ INT i_APCI2200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI2200_ConfigWatchdog(comedi_device *dev, +| Function Name : int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Configures The Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -418,7 +418,7 @@ INT i_APCI2200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI2200_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, +int i_APCI2200_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { if (data[0] == 0) { @@ -446,12 +446,12 @@ int i_APCI2200_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_StartStopWriteWatchdog | - | (comedi_device *dev,comedi_subdevice *s, + | (struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Start / Stop The Watchdog | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -464,7 +464,7 @@ int i_APCI2200_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI2200_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, +int i_APCI2200_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { switch (data[0]) { @@ -491,12 +491,12 @@ int i_APCI2200_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_ReadWatchdog | -| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Read The Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s, :pointer to subdevice structure comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -509,7 +509,7 @@ int i_APCI2200_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI2200_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, +int i_APCI2200_ReadWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { data[0] = @@ -520,11 +520,11 @@ int i_APCI2200_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI2200_Reset(comedi_device *dev) | | +| Function Name : int i_APCI2200_Reset(struct comedi_device *dev) | | +----------------------------------------------------------------------------+ | Task :resets all the registers | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev +| Input Parameters : struct comedi_device *dev +----------------------------------------------------------------------------+ | Output Parameters : -- | +----------------------------------------------------------------------------+ @@ -533,7 +533,7 @@ int i_APCI2200_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -INT i_APCI2200_Reset(comedi_device * dev) +INT i_APCI2200_Reset(struct comedi_device * dev) { outw(0x0, devpriv->iobase + APCI2200_DIGITAL_OP); //RESETS THE DIGITAL OUTPUTS outw(0x0, diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h index 59fc451e71c7..ab1bb309767a 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h @@ -36,26 +36,26 @@ // Hardware Layer functions for Apci2200 //Digital Input -INT i_APCI2200_ReadMoreDigitalInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI2200_Read1DigitalInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI2200_Read1DigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //Digital Output -int i_APCI2200_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s, +int i_APCI2200_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI2200_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI2200_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI2200_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI2200_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); // TIMER -int i_APCI2200_ConfigWatchdog(comedi_device *dev, comedi_subdevice *s, +int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI2200_StartStopWriteWatchdog(comedi_device *dev, comedi_subdevice *s, +int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI2200_ReadWatchdog(comedi_device *dev, comedi_subdevice *s, +int i_APCI2200_ReadWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //reset -INT i_APCI2200_Reset(comedi_device *dev); +INT i_APCI2200_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 45445e675f72..6aaab8cf3c1a 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c @@ -57,14 +57,14 @@ static UINT ui_Temp = 0; /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_InsnConfigAnalogInput(comedi_device *dev,| +| Function name :int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev,| | comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Calls card specific function | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | comedi_insn *insn | | unsigned int *data | @@ -74,7 +74,7 @@ static UINT ui_Temp = 0; +----------------------------------------------------------------------------+ */ -int i_APCI3120_InsnConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, +int i_APCI3120_InsnConfigAnalogInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT i; @@ -124,7 +124,7 @@ int i_APCI3120_InsnConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_InsnReadAnalogInput(comedi_device *dev, | +| Function name :int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, | | comedi_subdevice *s,comedi_insn *insn, unsigned int *data) | | | +----------------------------------------------------------------------------+ @@ -135,7 +135,7 @@ int i_APCI3120_InsnConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, | time 10 microsec. | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | comedi_insn *insn | | unsigned int *data | @@ -145,7 +145,7 @@ int i_APCI3120_InsnConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI3120_InsnReadAnalogInput(comedi_device * dev, comedi_subdevice * s, +int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { USHORT us_ConvertTiming, us_TmpValue, i; @@ -393,14 +393,14 @@ int i_APCI3120_InsnReadAnalogInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_StopCyclicAcquisition(comedi_device *dev,| +| Function name :int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev,| | comedi_subdevice *s)| | | +----------------------------------------------------------------------------+ | Task : Stops Cyclic acquisition | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | | +----------------------------------------------------------------------------+ @@ -409,7 +409,7 @@ int i_APCI3120_InsnReadAnalogInput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI3120_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s) +int i_APCI3120_StopCyclicAcquisition(struct comedi_device * dev, comedi_subdevice * s) { // Disable A2P Fifo write and AMWEN signal outw(0, devpriv->i_IobaseAddon + 4); @@ -459,7 +459,7 @@ int i_APCI3120_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s) /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_CommandTestAnalogInput(comedi_device *dev| +| Function name :int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev| | ,comedi_subdevice *s,comedi_cmd *cmd) | | | +----------------------------------------------------------------------------+ @@ -467,7 +467,7 @@ int i_APCI3120_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s) | acquisition | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | comedi_cmd *cmd | +----------------------------------------------------------------------------+ @@ -476,7 +476,7 @@ int i_APCI3120_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s) +----------------------------------------------------------------------------+ */ -int i_APCI3120_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s, +int i_APCI3120_CommandTestAnalogInput(struct comedi_device * dev, comedi_subdevice * s, comedi_cmd * cmd) { int err = 0; @@ -616,7 +616,7 @@ int i_APCI3120_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function name : int i_APCI3120_CommandAnalogInput(comedi_device *dev, | +| Function name : int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, | | comedi_subdevice *s) | | | +----------------------------------------------------------------------------+ @@ -624,7 +624,7 @@ int i_APCI3120_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s, | Determines the mode 1 or 2. | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | | +----------------------------------------------------------------------------+ @@ -633,7 +633,7 @@ int i_APCI3120_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI3120_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s) +int i_APCI3120_CommandAnalogInput(struct comedi_device * dev, comedi_subdevice * s) { comedi_cmd *cmd = &s->async->cmd; @@ -690,7 +690,7 @@ int i_APCI3120_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s) /* +----------------------------------------------------------------------------+ | Function name : int i_APCI3120_CyclicAnalogInput(int mode, | -| comedi_device * dev,comedi_subdevice * s) | +| struct comedi_device * dev,comedi_subdevice * s) | +----------------------------------------------------------------------------+ | Task : This is used for analog input cyclic acquisition | | Performs the command operations. | @@ -707,7 +707,7 @@ int i_APCI3120_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s) +----------------------------------------------------------------------------+ */ -int i_APCI3120_CyclicAnalogInput(int mode, comedi_device * dev, +int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev, comedi_subdevice * s) { BYTE b_Tmp; @@ -1202,14 +1202,14 @@ int i_APCI3120_CyclicAnalogInput(int mode, comedi_device * dev, /* +----------------------------------------------------------------------------+ -| Function name : int i_APCI3120_Reset(comedi_device *dev) | +| Function name : int i_APCI3120_Reset(struct comedi_device *dev) | | | | | +----------------------------------------------------------------------------+ | Task : Hardware reset function | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | | | | +----------------------------------------------------------------------------+ @@ -1218,7 +1218,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3120_Reset(comedi_device * dev) +int i_APCI3120_Reset(struct comedi_device * dev) { unsigned int i; unsigned short us_TmpValue; @@ -1274,7 +1274,7 @@ int i_APCI3120_Reset(comedi_device * dev) /* +----------------------------------------------------------------------------+ -| Function name : int i_APCI3120_SetupChannelList(comedi_device * dev, | +| Function name : int i_APCI3120_SetupChannelList(struct comedi_device * dev, | | comedi_subdevice * s, int n_chan,unsigned int *chanlist| | ,char check) | | | @@ -1285,7 +1285,7 @@ int i_APCI3120_Reset(comedi_device * dev) |list is ok or not. | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device * dev | +| Input Parameters : struct comedi_device * dev | | comedi_subdevice * s | | int n_chan | unsigned int *chanlist @@ -1296,7 +1296,7 @@ int i_APCI3120_Reset(comedi_device * dev) +----------------------------------------------------------------------------+ */ -int i_APCI3120_SetupChannelList(comedi_device * dev, comedi_subdevice * s, +int i_APCI3120_SetupChannelList(struct comedi_device * dev, comedi_subdevice * s, int n_chan, unsigned int *chanlist, char check) { unsigned int i; //, differencial=0, bipolar=0; @@ -1344,14 +1344,14 @@ int i_APCI3120_SetupChannelList(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function name : int i_APCI3120_ExttrigEnable(comedi_device * dev) | +| Function name : int i_APCI3120_ExttrigEnable(struct comedi_device * dev) | | | | | +----------------------------------------------------------------------------+ | Task : Enable the external trigger | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device * dev | +| Input Parameters : struct comedi_device * dev | | | | | +----------------------------------------------------------------------------+ @@ -1360,7 +1360,7 @@ int i_APCI3120_SetupChannelList(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI3120_ExttrigEnable(comedi_device * dev) +int i_APCI3120_ExttrigEnable(struct comedi_device * dev) { devpriv->us_OutputRegister |= APCI3120_ENABLE_EXT_TRIGGER; @@ -1370,13 +1370,13 @@ int i_APCI3120_ExttrigEnable(comedi_device * dev) /* +----------------------------------------------------------------------------+ -| Function name : int i_APCI3120_ExttrigDisable(comedi_device * dev) | +| Function name : int i_APCI3120_ExttrigDisable(struct comedi_device * dev) | | | +----------------------------------------------------------------------------+ | Task : Disables the external trigger | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device * dev | +| Input Parameters : struct comedi_device * dev | | | | | +----------------------------------------------------------------------------+ @@ -1385,7 +1385,7 @@ int i_APCI3120_ExttrigEnable(comedi_device * dev) +----------------------------------------------------------------------------+ */ -int i_APCI3120_ExttrigDisable(comedi_device * dev) +int i_APCI3120_ExttrigDisable(struct comedi_device * dev) { devpriv->us_OutputRegister &= ~APCI3120_ENABLE_EXT_TRIGGER; outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS); @@ -1421,7 +1421,7 @@ int i_APCI3120_ExttrigDisable(comedi_device * dev) void v_APCI3120_Interrupt(int irq, void *d) { - comedi_device *dev = d; + struct comedi_device *dev = d; USHORT int_daq; unsigned int int_amcc, ui_Check, i; @@ -1612,7 +1612,7 @@ void v_APCI3120_Interrupt(int irq, void *d) /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_InterruptHandleEos(comedi_device *dev) | +| Function name :int i_APCI3120_InterruptHandleEos(struct comedi_device *dev) | | | | | +----------------------------------------------------------------------------+ @@ -1621,7 +1621,7 @@ void v_APCI3120_Interrupt(int irq, void *d) | to Comedi buffer. | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | | | | +----------------------------------------------------------------------------+ @@ -1630,7 +1630,7 @@ void v_APCI3120_Interrupt(int irq, void *d) +----------------------------------------------------------------------------+ */ -/*int i_APCI3120_InterruptHandleEos(comedi_device *dev) +/*int i_APCI3120_InterruptHandleEos(struct comedi_device *dev) { int n_chan,i; short *data; @@ -1654,7 +1654,7 @@ void v_APCI3120_Interrupt(int irq, void *d) } return 0; }*/ -int i_APCI3120_InterruptHandleEos(comedi_device * dev) +int i_APCI3120_InterruptHandleEos(struct comedi_device * dev) { int n_chan, i; comedi_subdevice *s = dev->subdevices + 0; @@ -1698,7 +1698,7 @@ int i_APCI3120_InterruptHandleEos(comedi_device * dev) void v_APCI3120_InterruptDma(int irq, void *d) { - comedi_device *dev = d; + struct comedi_device *dev = d; comedi_subdevice *s = dev->subdevices + 0; unsigned int next_dma_buf, samplesinbuf; unsigned long low_word, high_word, var; @@ -1886,7 +1886,7 @@ void v_APCI3120_InterruptDma(int irq, void *d) | Comedi buffer | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | short *dma | | short *data,int n | @@ -1896,7 +1896,7 @@ void v_APCI3120_InterruptDma(int irq, void *d) +----------------------------------------------------------------------------+ */ -/*void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device *dev,comedi_subdevice *s,short *dma,short *data,int n) +/*void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,comedi_subdevice *s,short *dma,short *data,int n) { int i,j,m; @@ -1925,7 +1925,7 @@ void v_APCI3120_InterruptDma(int irq, void *d) } */ -void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device * dev, +void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device * dev, comedi_subdevice * s, short * dma_buffer, unsigned int num_samples) { devpriv->ui_AiActualScan += @@ -1944,14 +1944,14 @@ void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device * dev, /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_InsnConfigTimer(comedi_device *dev, | +| Function name :int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, | | comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task :Configure Timer 2 | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | comedi_insn *insn | | unsigned int *data | @@ -1967,7 +1967,7 @@ void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3120_InsnConfigTimer(comedi_device * dev, comedi_subdevice * s, +int i_APCI3120_InsnConfigTimer(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -2092,13 +2092,13 @@ int i_APCI3120_InsnConfigTimer(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_InsnWriteTimer(comedi_device *dev, | +| Function name :int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, | | comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : To start and stop the timer | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | comedi_insn *insn | | unsigned int *data | @@ -2118,7 +2118,7 @@ int i_APCI3120_InsnConfigTimer(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI3120_InsnWriteTimer(comedi_device * dev, comedi_subdevice * s, +int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -2283,14 +2283,14 @@ int i_APCI3120_InsnWriteTimer(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function name : int i_APCI3120_InsnReadTimer(comedi_device *dev, | +| Function name : int i_APCI3120_InsnReadTimer(struct comedi_device *dev, | | comedi_subdevice *s,comedi_insn *insn, unsigned int *data) | | | | | +----------------------------------------------------------------------------+ | Task : read the Timer value | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | comedi_insn *insn | | unsigned int *data | @@ -2304,7 +2304,7 @@ int i_APCI3120_InsnWriteTimer(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -int i_APCI3120_InsnReadTimer(comedi_device * dev, comedi_subdevice * s, +int i_APCI3120_InsnReadTimer(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { BYTE b_Tmp; @@ -2360,7 +2360,7 @@ int i_APCI3120_InsnReadTimer(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_InsnReadDigitalInput(comedi_device *dev, | +| Function name :int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, | | comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | | | | | @@ -2368,7 +2368,7 @@ int i_APCI3120_InsnReadTimer(comedi_device * dev, comedi_subdevice * s, | Task : Reads the value of the specified Digital input channel| | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | comedi_insn *insn | | unsigned int *data | @@ -2378,7 +2378,7 @@ int i_APCI3120_InsnReadTimer(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI3120_InsnReadDigitalInput(comedi_device * dev, comedi_subdevice +int i_APCI3120_InsnReadDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Chan, ui_TmpValue; @@ -2403,7 +2403,7 @@ int i_APCI3120_InsnReadDigitalInput(comedi_device * dev, comedi_subdevice /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_InsnBitsDigitalInput(comedi_device *dev, | +| Function name :int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, | |comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ @@ -2411,7 +2411,7 @@ int i_APCI3120_InsnReadDigitalInput(comedi_device * dev, comedi_subdevice | value is returned in data[0] | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | comedi_insn *insn | | unsigned int *data | @@ -2420,7 +2420,7 @@ int i_APCI3120_InsnReadDigitalInput(comedi_device * dev, comedi_subdevice | | +----------------------------------------------------------------------------+ */ -int i_APCI3120_InsnBitsDigitalInput(comedi_device * dev, comedi_subdevice * s, +int i_APCI3120_InsnBitsDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_TmpValue; @@ -2442,14 +2442,14 @@ int i_APCI3120_InsnBitsDigitalInput(comedi_device * dev, comedi_subdevice * s, */ /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_InsnConfigDigitalOutput(comedi_device | +| Function name :int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device | | *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task :Configure the output memory ON or OFF | | | +----------------------------------------------------------------------------+ -| Input Parameters :comedi_device *dev | +| Input Parameters :struct comedi_device *dev | | comedi_subdevice *s | | comedi_insn *insn | | unsigned int *data | @@ -2459,7 +2459,7 @@ int i_APCI3120_InsnBitsDigitalInput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI3120_InsnConfigDigitalOutput(comedi_device * dev, +int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -2485,14 +2485,14 @@ int i_APCI3120_InsnConfigDigitalOutput(comedi_device * dev, /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_InsnBitsDigitalOutput(comedi_device *dev, | +| Function name :int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev, | | comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : write diatal output port | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | comedi_insn *insn | | unsigned int *data | @@ -2505,7 +2505,7 @@ int i_APCI3120_InsnConfigDigitalOutput(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3120_InsnBitsDigitalOutput(comedi_device * dev, comedi_subdevice +int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { if ((data[0] > this_board->i_DoMaxdata) || (data[0] < 0)) { @@ -2536,14 +2536,14 @@ int i_APCI3120_InsnBitsDigitalOutput(comedi_device * dev, comedi_subdevice /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_InsnWriteDigitalOutput(comedi_device *dev,| +| Function name :int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev,| |comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Write digiatl output | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | comedi_insn *insn | | unsigned int *data | @@ -2556,7 +2556,7 @@ int i_APCI3120_InsnBitsDigitalOutput(comedi_device * dev, comedi_subdevice +----------------------------------------------------------------------------+ */ -int i_APCI3120_InsnWriteDigitalOutput(comedi_device * dev, comedi_subdevice +int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -2617,14 +2617,14 @@ int i_APCI3120_InsnWriteDigitalOutput(comedi_device * dev, comedi_subdevice /* +----------------------------------------------------------------------------+ -| Function name :int i_APCI3120_InsnWriteAnalogOutput(comedi_device *dev,| +| Function name :int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,| |comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Write analog output | | | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | comedi_insn *insn | | unsigned int *data | @@ -2634,7 +2634,7 @@ int i_APCI3120_InsnWriteDigitalOutput(comedi_device * dev, comedi_subdevice +----------------------------------------------------------------------------+ */ -int i_APCI3120_InsnWriteAnalogOutput(comedi_device * dev, comedi_subdevice +int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Range, ui_Channel; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h index 591061743c74..ee346f6d0ba1 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h @@ -178,64 +178,64 @@ typedef struct { // Function Declaration For APCI-3120 // Internal functions -int i_APCI3120_SetupChannelList(comedi_device *dev, comedi_subdevice *s, +int i_APCI3120_SetupChannelList(struct comedi_device *dev, comedi_subdevice *s, int n_chan, unsigned int *chanlist, char check); -int i_APCI3120_ExttrigEnable(comedi_device *dev); -int i_APCI3120_ExttrigDisable(comedi_device *dev); -int i_APCI3120_StopCyclicAcquisition(comedi_device *dev, comedi_subdevice *s); -int i_APCI3120_Reset(comedi_device *dev); -int i_APCI3120_CyclicAnalogInput(int mode, comedi_device *dev, +int i_APCI3120_ExttrigEnable(struct comedi_device *dev); +int i_APCI3120_ExttrigDisable(struct comedi_device *dev); +int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, comedi_subdevice *s); +int i_APCI3120_Reset(struct comedi_device *dev); +int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev, comedi_subdevice *s); // Interrupt functions void v_APCI3120_Interrupt(int irq, void *d); -//UPDATE-0.7.57->0.7.68 void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device *dev,comedi_subdevice *s,short *dma,short *data,int n); -void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device *dev, +//UPDATE-0.7.57->0.7.68 void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,comedi_subdevice *s,short *dma,short *data,int n); +void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev, comedi_subdevice *s, short *dma_buffer, unsigned int num_samples); -int i_APCI3120_InterruptHandleEos(comedi_device *dev); +int i_APCI3120_InterruptHandleEos(struct comedi_device *dev); void v_APCI3120_InterruptDma(int irq, void *d); // TIMER -int i_APCI3120_InsnConfigTimer(comedi_device *dev, comedi_subdevice *s, +int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI3120_InsnWriteTimer(comedi_device *dev, comedi_subdevice *s, +int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI3120_InsnReadTimer(comedi_device *dev, comedi_subdevice *s, +int i_APCI3120_InsnReadTimer(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //DI // for di read -int i_APCI3120_InsnBitsDigitalInput(comedi_device *dev, comedi_subdevice *s, +int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI3120_InsnReadDigitalInput(comedi_device *dev, comedi_subdevice *s, +int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //DO -//int i_APCI3120_WriteDigitalOutput(comedi_device *dev, BYTE data); -int i_APCI3120_InsnConfigDigitalOutput(comedi_device *dev, +//int i_APCI3120_WriteDigitalOutput(struct comedi_device *dev, BYTE data); +int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI3120_InsnBitsDigitalOutput(comedi_device *dev, comedi_subdevice *s, +int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI3120_InsnWriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, +int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //AO -//int i_APCI3120_Write1AnalogValue(comedi_device *dev,UINT ui_Range,UINT ui_Channel,UINT data ); -int i_APCI3120_InsnWriteAnalogOutput(comedi_device *dev, comedi_subdevice *s, +//int i_APCI3120_Write1AnalogValue(struct comedi_device *dev,UINT ui_Range,UINT ui_Channel,UINT data ); +int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //AI HArdware layer -int i_APCI3120_InsnConfigAnalogInput(comedi_device *dev, comedi_subdevice *s, +int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI3120_InsnReadAnalogInput(comedi_device *dev, comedi_subdevice *s, +int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI3120_CommandTestAnalogInput(comedi_device *dev, comedi_subdevice *s, +int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, comedi_subdevice *s, comedi_cmd *cmd); -int i_APCI3120_CommandAnalogInput(comedi_device *dev, comedi_subdevice *s); -//int i_APCI3120_CancelAnalogInput(comedi_device *dev, comedi_subdevice *s); -int i_APCI3120_StopCyclicAcquisition(comedi_device *dev, comedi_subdevice *s); +int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, comedi_subdevice *s); +//int i_APCI3120_CancelAnalogInput(struct comedi_device *dev, comedi_subdevice *s); +int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, comedi_subdevice *s); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c index 83868d8f1c5f..f07e0b1cf8f8 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c @@ -453,7 +453,7 @@ VOID v_GetAPCI3200EepromCalibrationValue(DWORD dw_PCIBoardEepromAddress, } } -INT i_APCI3200_GetChannelCalibrationValue(comedi_device * dev, +INT i_APCI3200_GetChannelCalibrationValue(struct comedi_device * dev, unsigned int ui_Channel_num, unsigned int * CJCCurrentSource, unsigned int * ChannelCurrentSource, unsigned int * ChannelGainFactor) { @@ -530,12 +530,12 @@ INT i_APCI3200_GetChannelCalibrationValue(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadDigitalInput | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To read for Port Channel Numberfor single channel | UINT data[0] : 0: Read single channel @@ -550,7 +550,7 @@ INT i_APCI3200_GetChannelCalibrationValue(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI3200_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI3200_ReadDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp = 0; @@ -592,12 +592,12 @@ INT i_APCI3200_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ConfigDigitalOutput | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | data[0] :1 Memory enable 0 Memory Disable +----------------------------------------------------------------------------+ @@ -608,7 +608,7 @@ INT i_APCI3200_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -int i_APCI3200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, +int i_APCI3200_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -629,12 +629,12 @@ int i_APCI3200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_WriteDigitalOutput | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : writes To the digital Output Subdevice | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s : Subdevice Pointer | | comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | @@ -653,7 +653,7 @@ int i_APCI3200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI3200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI3200_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp = 0, ui_Temp1 = 0; @@ -746,12 +746,12 @@ INT i_APCI3200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadDigitalOutput | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To read | | UINT *data : Data Pointer to read status | data[0] :0 read single channel @@ -766,7 +766,7 @@ INT i_APCI3200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI3200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI3200_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp; @@ -807,12 +807,12 @@ INT i_APCI3200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI3200_ConfigAnalogInput | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Analog Input Subdevice | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s : Subdevice Pointer | | comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | @@ -874,7 +874,7 @@ INT i_APCI3200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI3200_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI3200_ConfigAnalogInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -1334,12 +1334,12 @@ INT i_APCI3200_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadAnalogInput | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To read | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -1361,7 +1361,7 @@ INT i_APCI3200_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI3200_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI3200_ReadAnalogInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_DummyValue = 0; @@ -1633,12 +1633,12 @@ INT i_APCI3200_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_Read1AnalogInputChannel | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannel : Channel No to read | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -1651,7 +1651,7 @@ INT i_APCI3200_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI3200_Read1AnalogInputChannel(comedi_device * dev, +INT i_APCI3200_Read1AnalogInputChannel(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_EOC = 0; @@ -1759,12 +1759,12 @@ INT i_APCI3200_Read1AnalogInputChannel(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadCalibrationOffsetValue | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read calibration offset value of the selected channel| +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -1776,7 +1776,7 @@ INT i_APCI3200_Read1AnalogInputChannel(comedi_device * dev, | | +----------------------------------------------------------------------------+ */ -int i_APCI3200_ReadCalibrationOffsetValue(comedi_device * dev, UINT * data) +int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device * dev, UINT * data) { UINT ui_Temp = 0, ui_EOC = 0; UINT ui_CommandRegister = 0; @@ -1895,12 +1895,12 @@ int i_APCI3200_ReadCalibrationOffsetValue(comedi_device * dev, UINT * data) /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadCalibrationGainValue | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read calibration gain value of the selected channel | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -1912,7 +1912,7 @@ int i_APCI3200_ReadCalibrationOffsetValue(comedi_device * dev, UINT * data) | | +----------------------------------------------------------------------------+ */ -int i_APCI3200_ReadCalibrationGainValue(comedi_device * dev, UINT * data) +int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, UINT * data) { UINT ui_EOC = 0; INT ui_CommandRegister = 0; @@ -2030,12 +2030,12 @@ int i_APCI3200_ReadCalibrationGainValue(comedi_device * dev, UINT * data) /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadCJCValue | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read CJC value of the selected channel | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -2048,7 +2048,7 @@ int i_APCI3200_ReadCalibrationGainValue(comedi_device * dev, UINT * data) +----------------------------------------------------------------------------+ */ -int i_APCI3200_ReadCJCValue(comedi_device * dev, unsigned int * data) +int i_APCI3200_ReadCJCValue(struct comedi_device * dev, unsigned int * data) { UINT ui_EOC = 0; INT ui_CommandRegister = 0; @@ -2150,12 +2150,12 @@ int i_APCI3200_ReadCJCValue(comedi_device * dev, unsigned int * data) /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadCJCCalOffset | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read CJC calibration offset value of the selected channel +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -2167,7 +2167,7 @@ int i_APCI3200_ReadCJCValue(comedi_device * dev, unsigned int * data) | | +----------------------------------------------------------------------------+ */ -int i_APCI3200_ReadCJCCalOffset(comedi_device * dev, unsigned int * data) +int i_APCI3200_ReadCJCCalOffset(struct comedi_device * dev, unsigned int * data) { UINT ui_EOC = 0; INT ui_CommandRegister = 0; @@ -2265,12 +2265,12 @@ int i_APCI3200_ReadCJCCalOffset(comedi_device * dev, unsigned int * data) /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadCJCGainValue | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read CJC calibration gain value +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To read | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -2283,7 +2283,7 @@ int i_APCI3200_ReadCJCCalOffset(comedi_device * dev, unsigned int * data) | | +----------------------------------------------------------------------------+ */ -int i_APCI3200_ReadCJCCalGain(comedi_device * dev, unsigned int * data) +int i_APCI3200_ReadCJCCalGain(struct comedi_device * dev, unsigned int * data) { UINT ui_EOC = 0; INT ui_CommandRegister = 0; @@ -2375,12 +2375,12 @@ int i_APCI3200_ReadCJCCalGain(comedi_device * dev, unsigned int * data) /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_InsnBits_AnalogInput_Test | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Tests the Selected Anlog Input Channel | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s : Subdevice Pointer | | comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | @@ -2404,7 +2404,7 @@ int i_APCI3200_ReadCJCCalGain(comedi_device * dev, unsigned int * data) +----------------------------------------------------------------------------+ */ -INT i_APCI3200_InsnBits_AnalogInput_Test(comedi_device * dev, +INT i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Configuration = 0; @@ -2510,12 +2510,12 @@ INT i_APCI3200_InsnBits_AnalogInput_Test(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_InsnWriteReleaseAnalogInput | - | (comedi_device *dev,comedi_subdevice *s, | + | (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Resets the channels | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev : Driver handle | + | Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s : Subdevice Pointer | | comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer @@ -2529,7 +2529,7 @@ INT i_APCI3200_InsnBits_AnalogInput_Test(comedi_device * dev, +----------------------------------------------------------------------------+ */ -INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device * dev, +INT i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { i_APCI3200_Reset(dev); @@ -2538,7 +2538,7 @@ INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device * dev, /* +----------------------------------------------------------------------------+ - | Function name :int i_APCI3200_CommandTestAnalogInput(comedi_device *dev| + | Function name :int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev| | ,comedi_subdevice *s,comedi_cmd *cmd) | | | +----------------------------------------------------------------------------+ @@ -2546,7 +2546,7 @@ INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device * dev, | acquisition | | | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev | + | Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | comedi_cmd *cmd | | | @@ -2560,7 +2560,7 @@ INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3200_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s, +int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, comedi_subdevice * s, comedi_cmd * cmd) { @@ -2748,14 +2748,14 @@ int i_APCI3200_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ - | Function name :int i_APCI3200_StopCyclicAcquisition(comedi_device *dev,| + | Function name :int i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev,| | comedi_subdevice *s)| | | +----------------------------------------------------------------------------+ | Task : Stop the acquisition | | | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev | + | Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | | +----------------------------------------------------------------------------+ @@ -2764,7 +2764,7 @@ int i_APCI3200_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s, +----------------------------------------------------------------------------+ */ -int i_APCI3200_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s) +int i_APCI3200_StopCyclicAcquisition(struct comedi_device * dev, comedi_subdevice * s) { UINT ui_Configuration = 0; //i_InterruptFlag=0; @@ -2796,7 +2796,7 @@ int i_APCI3200_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s) /* +----------------------------------------------------------------------------+ - | Function name : int i_APCI3200_CommandAnalogInput(comedi_device *dev, | + | Function name : int i_APCI3200_CommandAnalogInput(struct comedi_device *dev, | | comedi_subdevice *s) | | | +----------------------------------------------------------------------------+ @@ -2804,7 +2804,7 @@ int i_APCI3200_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s) | Determines the mode 1 or 2. | | | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev | + | Input Parameters : struct comedi_device *dev | | comedi_subdevice *s | | | | | @@ -2814,7 +2814,7 @@ int i_APCI3200_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s) +----------------------------------------------------------------------------+ */ -int i_APCI3200_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s) +int i_APCI3200_CommandAnalogInput(struct comedi_device * dev, comedi_subdevice * s) { comedi_cmd *cmd = &s->async->cmd; UINT ui_Configuration = 0; @@ -2987,7 +2987,7 @@ int i_APCI3200_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s) /* +----------------------------------------------------------------------------+ - | Function Name : int i_APCI3200_Reset(comedi_device *dev) | + | Function Name : int i_APCI3200_Reset(struct comedi_device *dev) | | | +----------------------------------------------------------------------------+ | Task :Resets the registers of the card | @@ -3001,7 +3001,7 @@ int i_APCI3200_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s) +----------------------------------------------------------------------------+ */ -int i_APCI3200_Reset(comedi_device * dev) +int i_APCI3200_Reset(struct comedi_device * dev) { INT i_Temp; DWORD dw_Dummy; @@ -3059,7 +3059,7 @@ int i_APCI3200_Reset(comedi_device * dev) */ void v_APCI3200_Interrupt(int irq, void *d) { - comedi_device *dev = d; + struct comedi_device *dev = d; UINT ui_StatusRegister = 0; UINT ui_ChannelNumber = 0; INT i_CalibrationFlag = 0; @@ -3482,7 +3482,7 @@ void v_APCI3200_Interrupt(int irq, void *d) /* +----------------------------------------------------------------------------+ - | Function name :int i_APCI3200_InterruptHandleEos(comedi_device *dev) | + | Function name :int i_APCI3200_InterruptHandleEos(struct comedi_device *dev) | | | | | +----------------------------------------------------------------------------+ @@ -3491,7 +3491,7 @@ void v_APCI3200_Interrupt(int irq, void *d) | to Comedi buffer. | | | +----------------------------------------------------------------------------+ - | Input Parameters : comedi_device *dev | + | Input Parameters : struct comedi_device *dev | | | | | +----------------------------------------------------------------------------+ @@ -3499,7 +3499,7 @@ void v_APCI3200_Interrupt(int irq, void *d) | | +----------------------------------------------------------------------------+ */ -int i_APCI3200_InterruptHandleEos(comedi_device * dev) +int i_APCI3200_InterruptHandleEos(struct comedi_device * dev) { UINT ui_StatusRegister = 0; comedi_subdevice *s = dev->subdevices + 0; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h index 09445d5f673e..fbb658eff531 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h @@ -154,34 +154,34 @@ typedef struct { //AI -INT i_APCI3200_ConfigAnalogInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI3200_ConfigAnalogInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI3200_ReadAnalogInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI3200_ReadAnalogInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device *dev, +INT i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI3200_InsnBits_AnalogInput_Test(comedi_device *dev, +INT i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI3200_StopCyclicAcquisition(comedi_device *dev, comedi_subdevice *s); -INT i_APCI3200_InterruptHandleEos(comedi_device *dev); -INT i_APCI3200_CommandTestAnalogInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev, comedi_subdevice *s); +INT i_APCI3200_InterruptHandleEos(struct comedi_device *dev); +INT i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev, comedi_subdevice *s, comedi_cmd *cmd); -INT i_APCI3200_CommandAnalogInput(comedi_device *dev, comedi_subdevice *s); -INT i_APCI3200_ReadDigitalInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI3200_CommandAnalogInput(struct comedi_device *dev, comedi_subdevice *s); +INT i_APCI3200_ReadDigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //Interrupt void v_APCI3200_Interrupt(int irq, void *d); -int i_APCI3200_InterruptHandleEos(comedi_device *dev); +int i_APCI3200_InterruptHandleEos(struct comedi_device *dev); //Reset functions -INT i_APCI3200_Reset(comedi_device *dev); +INT i_APCI3200_Reset(struct comedi_device *dev); -int i_APCI3200_ReadCJCCalOffset(comedi_device *dev, unsigned int *data); -int i_APCI3200_ReadCJCValue(comedi_device *dev, unsigned int *data); -int i_APCI3200_ReadCalibrationGainValue(comedi_device *dev, UINT *data); -int i_APCI3200_ReadCalibrationOffsetValue(comedi_device *dev, UINT *data); -int i_APCI3200_Read1AnalogInputChannel(comedi_device *dev, +int i_APCI3200_ReadCJCCalOffset(struct comedi_device *dev, unsigned int *data); +int i_APCI3200_ReadCJCValue(struct comedi_device *dev, unsigned int *data); +int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev, UINT *data); +int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev, UINT *data); +int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI3200_ReadCJCCalGain(comedi_device *dev, unsigned int *data); +int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c index 8f5bc0132a62..352e630a603a 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c @@ -56,12 +56,12 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ReadDigitalInput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To read | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -73,7 +73,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ */ -INT i_APCI3501_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI3501_ReadDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp; @@ -99,12 +99,12 @@ INT i_APCI3501_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ConfigDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -121,7 +121,7 @@ INT i_APCI3501_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -int i_APCI3501_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, +int i_APCI3501_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -142,12 +142,12 @@ int i_APCI3501_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_WriteDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : writes To the digital Output Subdevice | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s : Subdevice Pointer | | comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | @@ -161,7 +161,7 @@ int i_APCI3501_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI3501_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI3501_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp, ui_Temp1; @@ -232,12 +232,12 @@ INT i_APCI3501_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ReadDigitalOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT ui_NoOfChannels : No Of Channels To read | | UINT *data : Data Pointer to read status | +----------------------------------------------------------------------------+ @@ -248,7 +248,7 @@ INT i_APCI3501_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI3501_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI3501_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { UINT ui_Temp; @@ -275,12 +275,12 @@ INT i_APCI3501_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ConfigAnalogOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Analog Output Subdevice | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s : Subdevice Pointer | | comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | @@ -298,7 +298,7 @@ INT i_APCI3501_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI3501_ConfigAnalogOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI3501_ConfigAnalogOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { outl(data[0], @@ -316,12 +316,12 @@ INT i_APCI3501_ConfigAnalogOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_WriteAnalogOutput | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes To the Selected Anlog Output Channel | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | comedi_subdevice *s : Subdevice Pointer | | comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | @@ -336,7 +336,7 @@ INT i_APCI3501_ConfigAnalogOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI3501_WriteAnalogOutput(comedi_device * dev, comedi_subdevice * s, +INT i_APCI3501_WriteAnalogOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { ULONG ul_Command1 = 0, ul_Channel_no, ul_Polarity, ul_DAC_Ready = 0;; @@ -386,12 +386,12 @@ INT i_APCI3501_WriteAnalogOutput(comedi_device * dev, comedi_subdevice * s, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ConfigTimerCounterWatchdog | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -410,7 +410,7 @@ INT i_APCI3501_WriteAnalogOutput(comedi_device * dev, comedi_subdevice * s, | | +----------------------------------------------------------------------------+ */ -INT i_APCI3501_ConfigTimerCounterWatchdog(comedi_device * dev, +INT i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { ULONG ul_Command1 = 0; @@ -489,12 +489,12 @@ INT i_APCI3501_ConfigTimerCounterWatchdog(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_StartStopWriteTimerCounterWatchdog | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Start / Stop The Selected Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -511,7 +511,7 @@ INT i_APCI3501_ConfigTimerCounterWatchdog(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3501_StartStopWriteTimerCounterWatchdog(comedi_device * dev, +int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { ULONG ul_Command1 = 0; @@ -592,12 +592,12 @@ int i_APCI3501_StartStopWriteTimerCounterWatchdog(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ReadTimerCounterWatchdog | -| (comedi_device *dev,comedi_subdevice *s, | +| (struct comedi_device *dev,comedi_subdevice *s, | | comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read The Selected Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev : Driver handle | +| Input Parameters : struct comedi_device *dev : Driver handle | | UINT *data : Data Pointer contains | | configuration parameters as below | | | @@ -613,7 +613,7 @@ int i_APCI3501_StartStopWriteTimerCounterWatchdog(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3501_ReadTimerCounterWatchdog(comedi_device * dev, +int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { @@ -640,7 +640,7 @@ int i_APCI3501_ReadTimerCounterWatchdog(comedi_device * dev, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI3501_Reset(comedi_device *dev) | +| Function Name : int i_APCI3501_Reset(struct comedi_device *dev) | | | +----------------------------------------------------------------------------+ | Task :Resets the registers of the card | @@ -654,7 +654,7 @@ int i_APCI3501_ReadTimerCounterWatchdog(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3501_Reset(comedi_device * dev) +int i_APCI3501_Reset(struct comedi_device * dev) { int i_Count = 0, i_temp = 0; ULONG ul_Command1 = 0, ul_Polarity, ul_DAC_Ready = 0; @@ -708,7 +708,7 @@ int i_APCI3501_Reset(comedi_device * dev) void v_APCI3501_Interrupt(int irq, void *d) { int i_temp; - comedi_device *dev = d; + struct comedi_device *dev = d; unsigned int ui_Timer_AOWatchdog; unsigned long ul_Command1; // Disable Interrupt diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h index aeb7f032884f..a7dd01e5e57a 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h @@ -55,40 +55,40 @@ comedi_lrange range_apci3501_ao = { 2, { // Hardware Layer functions for Apci3501 //AO -INT i_APCI3501_ConfigAnalogOutput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI3501_WriteAnalogOutput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //DI // for di read -//INT i_APCI3501_ReadDigitalInput(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data); +//INT i_APCI3501_ReadDigitalInput(struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data); -INT i_APCI3501_ReadDigitalInput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI3501_ReadDigitalInput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //DO -int i_APCI3501_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s, +int i_APCI3501_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI3501_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI3501_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -INT i_APCI3501_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s, +INT i_APCI3501_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); // TIMER // timer value is passed as u seconds -INT i_APCI3501_ConfigTimerCounterWatchdog(comedi_device *dev, +INT i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI3501_StartStopWriteTimerCounterWatchdog(comedi_device *dev, +int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); -int i_APCI3501_ReadTimerCounterWatchdog(comedi_device *dev, +int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev, comedi_subdevice *s, comedi_insn *insn, unsigned int *data); //Interrupt void v_APCI3501_Interrupt(int irq, void *d); //Reset functions -int i_APCI3501_Reset(comedi_device *dev); +int i_APCI3501_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c index 7a78c99405b2..44ca298f75ba 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c @@ -55,7 +55,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI3XXX_TestConversionStarted | -| (comedi_device *dev) | +| (struct comedi_device *dev) | +----------------------------------------------------------------------------+ | Task Test if any conversion started | +----------------------------------------------------------------------------+ @@ -68,7 +68,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_TestConversionStarted(comedi_device * dev) +int i_APCI3XXX_TestConversionStarted(struct comedi_device * dev) { if ((readl((void *)(devpriv->dw_AiBase + 8)) & 0x80000UL) == 0x80000UL) { return (1); @@ -80,7 +80,7 @@ int i_APCI3XXX_TestConversionStarted(comedi_device * dev) /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI3XXX_AnalogInputConfigOperatingMode | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -105,7 +105,7 @@ int i_APCI3XXX_TestConversionStarted(comedi_device * dev) +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_AnalogInputConfigOperatingMode(comedi_device * dev, +int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -274,7 +274,7 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI3XXX_InsnConfigAnalogInput | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -295,7 +295,7 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_InsnConfigAnalogInput(comedi_device * dev, +int i_APCI3XXX_InsnConfigAnalogInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -332,7 +332,7 @@ int i_APCI3XXX_InsnConfigAnalogInput(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI3XXX_InsnReadAnalogInput | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -355,7 +355,7 @@ int i_APCI3XXX_InsnConfigAnalogInput(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_InsnReadAnalogInput(comedi_device * dev, +int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -606,7 +606,7 @@ int i_APCI3XXX_InsnReadAnalogInput(comedi_device * dev, void v_APCI3XXX_Interrupt(int irq, void *d) { - comedi_device *dev = d; + struct comedi_device *dev = d; BYTE b_CopyCpt = 0; DWORD dw_Status = 0; @@ -663,7 +663,7 @@ void v_APCI3XXX_Interrupt(int irq, void *d) /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI3XXX_InsnWriteAnalogOutput | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -684,7 +684,7 @@ void v_APCI3XXX_Interrupt(int irq, void *d) +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_InsnWriteAnalogOutput(comedi_device * dev, +int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { BYTE b_Range = (BYTE) CR_RANGE(insn->chanspec); @@ -769,7 +769,7 @@ int i_APCI3XXX_InsnWriteAnalogOutput(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI3XXX_InsnConfigInitTTLIO | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -791,7 +791,7 @@ int i_APCI3XXX_InsnWriteAnalogOutput(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_InsnConfigInitTTLIO(comedi_device * dev, +int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -900,7 +900,7 @@ int i_APCI3XXX_InsnConfigInitTTLIO(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI3XXX_InsnBitsTTLIO | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -919,7 +919,7 @@ int i_APCI3XXX_InsnConfigInitTTLIO(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_InsnBitsTTLIO(comedi_device * dev, +int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -1057,7 +1057,7 @@ int i_APCI3XXX_InsnBitsTTLIO(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI3XXX_InsnReadTTLIO | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -1074,7 +1074,7 @@ int i_APCI3XXX_InsnBitsTTLIO(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_InsnReadTTLIO(comedi_device * dev, +int i_APCI3XXX_InsnReadTTLIO(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec); @@ -1169,7 +1169,7 @@ int i_APCI3XXX_InsnReadTTLIO(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI3XXX_InsnWriteTTLIO | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -1187,7 +1187,7 @@ int i_APCI3XXX_InsnReadTTLIO(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_InsnWriteTTLIO(comedi_device * dev, +int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -1281,7 +1281,7 @@ int i_APCI3XXX_InsnWriteTTLIO(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3XXX_InsnReadDigitalInput | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -1298,7 +1298,7 @@ int i_APCI3XXX_InsnWriteTTLIO(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_InsnReadDigitalInput(comedi_device * dev, +int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -1340,7 +1340,7 @@ int i_APCI3XXX_InsnReadDigitalInput(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3XXX_InsnBitsDigitalInput | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -1356,7 +1356,7 @@ int i_APCI3XXX_InsnReadDigitalInput(comedi_device * dev, | -101 : Data size error | +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_InsnBitsDigitalInput(comedi_device * dev, +int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -1391,7 +1391,7 @@ int i_APCI3XXX_InsnBitsDigitalInput(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3XXX_InsnBitsDigitalOutput | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -1409,7 +1409,7 @@ int i_APCI3XXX_InsnBitsDigitalInput(comedi_device * dev, | -101 : Data size error | +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_InsnBitsDigitalOutput(comedi_device * dev, +int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -1487,7 +1487,7 @@ int i_APCI3XXX_InsnBitsDigitalOutput(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3XXX_InsnWriteDigitalOutput | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -1505,7 +1505,7 @@ int i_APCI3XXX_InsnBitsDigitalOutput(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_InsnWriteDigitalOutput(comedi_device * dev, +int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -1563,7 +1563,7 @@ int i_APCI3XXX_InsnWriteDigitalOutput(comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3XXX_InsnReadDigitalOutput | -| (comedi_device *dev, | +| (struct comedi_device *dev, | | comedi_subdevice *s, | | comedi_insn *insn, | | unsigned int *data) | @@ -1580,7 +1580,7 @@ int i_APCI3XXX_InsnWriteDigitalOutput(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_InsnReadDigitalOutput(comedi_device * dev, +int i_APCI3XXX_InsnReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -1627,10 +1627,10 @@ int i_APCI3XXX_InsnReadDigitalOutput(comedi_device * dev, /* +----------------------------------------------------------------------------+ -| Function Name : int i_APCI3XXX_Reset(comedi_device *dev) | +----------------------------------------------------------------------------+ +| Function Name : int i_APCI3XXX_Reset(struct comedi_device *dev) | +----------------------------------------------------------------------------+ | Task :resets all the registers | +----------------------------------------------------------------------------+ -| Input Parameters : comedi_device *dev | +| Input Parameters : struct comedi_device *dev | +----------------------------------------------------------------------------+ | Output Parameters : - | +----------------------------------------------------------------------------+ @@ -1638,7 +1638,7 @@ int i_APCI3XXX_InsnReadDigitalOutput(comedi_device * dev, +----------------------------------------------------------------------------+ */ -int i_APCI3XXX_Reset(comedi_device * dev) +int i_APCI3XXX_Reset(struct comedi_device * dev) { unsigned char b_Cpt = 0; |