diff options
Diffstat (limited to 'drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c')
-rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c | 66 |
1 files changed, 33 insertions, 33 deletions
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 |