Staging: Comedi: change space indentation to tabs (356cdbcb) · Commits · git / linux-net

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -695,15 +695,15 @@ int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev,
		\| unsigned char_ b_ModulNbr CR_AREF(aref) : Selected module number (0 to 3)\|
		\| unsigned char_ b_PortValue CR_CHAN(chanspec) : Output Value ( 0 To 7 )
		\| data[0] read or write port
		data[1] if write then indicate ON or OFF
		\| data[1] if write then indicate ON or OFF

		if read : data[1] will return port status.
		\| if read : data[1] will return port status.
		+----------------------------------------------------------------------------+
		\| Output Parameters : - \|
		+----------------------------------------------------------------------------+
		\| Return Value :

		INPUT :
		\| INPUT :

		0: No error \|
		\| -1: The handle parameter of the board is wrong \|

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

+55 −51

Original line number	Diff line number	Diff line
		@@ -69,37 +69,37 @@ int i_Flag = 1;
		\| \|
		\| data[0] : 0 Configure As Timer \|
		\| 1 Configure As Watchdog \|
		data[1] : Watchdog number
		\| data[1] : Watchdog number
		\| data[2] : Time base Unit \|
		\| data[3] : Reload Value \|
		data[4] : External Trigger \|
		1:Enable
		0:Disable
		data[5] :External Trigger Level
		00 Trigger Disabled
		01 Trigger Enabled (Low level)
		10 Trigger Enabled (High Level)
		11 Trigger Enabled (High/Low level)
		data[6] : External Gate \|
		1:Enable
		0:Disable
		data[7] : External Gate level
		00 Gate Disabled
		01 Gate Enabled (Low level)
		10 Gate Enabled (High Level)
		data[8] :Warning Relay
		1: ENABLE
		0: DISABLE
		data[9] :Warning Delay available
		data[10] :Warning Relay Time unit
		data[11] :Warning Relay Time Reload value
		data[12] :Reset Relay
		1 : ENABLE
		0 : DISABLE
		data[13] :Interrupt
		1 : ENABLE
		0 : DISABLE

		\| data[4] : External Trigger \|
		\| 1:Enable
		\| 0:Disable
		\| data[5] :External Trigger Level
		\| 00 Trigger Disabled
		\| 01 Trigger Enabled (Low level)
		\| 10 Trigger Enabled (High Level)
		\| 11 Trigger Enabled (High/Low level)
		\| data[6] : External Gate \|
		\| 1:Enable
		\| 0:Disable
		\| data[7] : External Gate level
		\| 00 Gate Disabled
		\| 01 Gate Enabled (Low level)
		\| 10 Gate Enabled (High Level)
		\| data[8] :Warning Relay
		\| 1: ENABLE
		\| 0: DISABLE
		\| data[9] :Warning Delay available
		\| data[10] :Warning Relay Time unit
		\| data[11] :Warning Relay Time Reload value
		\| data[12] :Reset Relay
		\| 1 : ENABLE
		\| 0 : DISABLE
		\| data[13] :Interrupt
		\| 1 : ENABLE
		\| 0 : DISABLE
		\|
		\|
		+----------------------------------------------------------------------------+
		\| Output Parameters : -- \|
		@@ -381,11 +381,11 @@ int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
		\| \|
		+----------------------------------------------------------------------------+
		\| Output Parameters : data[0] : software trigger status
		data[1] : hardware trigger status
		\| data[1] : hardware trigger status
		\| data[2] : Software clear status
		data[3] : Overflow status
		data[4] : Timer actual value

		\| data[3] : Overflow status
		\| data[4] : Timer actual value
		\|

		+----------------------------------------------------------------------------+
		\| Return Value : TRUE : No error occur \|
		@@ -398,13 +398,17 @@ int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, struct comedi_subdevi
		{
		unsigned int ui_Status = 0; /* Status register */
		i_WatchdogNbr = insn->unused[0];

		/******************/
		/* Get the status */
		/******************/

		ui_Status = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 16);

		/***********************************/
		/* Get the software trigger status */
		/***********************************/

		data[0] = ((ui_Status >> 1) & 1);
		/***********************************/
		/* Get the hardware trigger status */

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

+57 −57

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled =
		\| data[0] :Number of the input port on \|
		\| which the event will take place \|
		\| (1 or 2)
		data[1] : The event logic for port 1 has \|
		\| data[1] : The event logic for port 1 has \|
		\| three possibilities \|
		\| :0 APCI1500_AND :This logic \|
		\| links \|
		@@ -508,9 +508,9 @@ int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
		\| Input Parameters : struct comedi_device *dev : Driver handle \|
		\| unsigned int ui_Channel : Channel number to read \|
		\| unsigned int *data : Data Pointer to read status \|
		data[0] :0 Start input event
		1 Stop input event
		data[1] :No of port (1 or 2)
		\| data[0] :0 Start input event
		\| 1 Stop input event
		\| data[1] :No of port (1 or 2)
		+----------------------------------------------------------------------------+
		\| Output Parameters : -- \|
		+----------------------------------------------------------------------------+
		@@ -945,9 +945,9 @@ int i_APCI1500_Initialisation(struct comedi_device *dev, struct comedi_subdevice
		\| Input Parameters : struct comedi_device *dev : Driver handle \|
		\| unsigned int ui_NoOfChannels : No Of Channels To be Read \|
		\| unsigned int *data : Data Pointer
		data[0] : 0 Read a single channel
		1 read a port value
		data[1] : port value
		\| data[0] : 0 Read a single channel
		\| 1 read a port value
		\| data[1] : port value
		+----------------------------------------------------------------------------+
		\| Output Parameters : -- data[0] :The read status value
		+----------------------------------------------------------------------------+
		@@ -1015,21 +1015,21 @@ int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
		/*
		+----------------------------------------------------------------------------+
		\| Function Name : int i_APCI1500_ConfigDigitalOutputErrorInterrupt
		(struct comedi_device dev,struct comedi_subdevice s struct comedi_insn
		insn,unsigned int data) \|
		\| (struct comedi_device dev,struct comedi_subdevice s struct comedi_insn
		\| insn,unsigned int data) \|
		\| \|
		+----------------------------------------------------------------------------+
		\| Task : Configures the digital output memory and the digital
		output error interrupt \|
		\| output error interrupt \|
		+----------------------------------------------------------------------------+
		\| Input Parameters : struct comedi_device *dev : Driver handle \|
		\| unsigned int *data : Data Pointer contains \|
		\| configuration parameters as below \|
		\| struct comedi_subdevice *s, :pointer to subdevice structure
		struct comedi_insn *insn :pointer to insn structure \|
		\| struct comedi_insn *insn :pointer to insn structure \|
		\| data[0] :1:Memory on \|
		\| 0:Memory off \|
		data[1] :1 Enable the voltage error interrupt
		\| data[1] :1 Enable the voltage error interrupt
		\| :0 Disable the voltage error interrupt \|
		\| \|
		+----------------------------------------------------------------------------+
		@@ -1215,23 +1215,23 @@ int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
		/*
		+----------------------------------------------------------------------------+
		\| Function Name : int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device
		dev,struct comedi_subdevice s,struct comedi_insn insn,unsigned int data)\|
		\| dev,struct comedi_subdevice s,struct comedi_insn insn,unsigned int data)\|
		\| \|
		+----------------------------------------------------------------------------+
		\| Task : Configures The Watchdog \|
		+----------------------------------------------------------------------------+
		\| Input Parameters : struct comedi_device *dev : Driver handle \|
		\| struct comedi_subdevice *s, :pointer to subdevice structure
		struct comedi_insn *insn :pointer to insn structure \|
		\| struct comedi_insn *insn :pointer to insn structure \|
		\| unsigned int *data : Data Pointer to read status data[0] : 2 APCI1500_1_8_KHZ
		\| 1 APCI1500_3_6_KHZ \|
		\| 0 APCI1500_115_KHZ
		data[1] : 0 Counter1/Timer1
		1 Counter2/Timer2
		2 Counter3/Watchdog
		data[2] : 0 Counter
		1 Timer/Watchdog
		data[3] : This parameter has \|
		\| data[1] : 0 Counter1/Timer1
		\| 1 Counter2/Timer2
		\| 2 Counter3/Watchdog
		\| data[2] : 0 Counter
		\| 1 Timer/Watchdog
		\| data[3] : This parameter has \|
		\| two meanings. \|
		\| - If the counter/timer \|
		\| is used as a counter \|
		@@ -1243,15 +1243,15 @@ int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
		\| the divider factor \|
		\| for the output is \|
		\| given.
		data[4] : 0 APCI1500_CONTINUOUS
		1 APCI1500_SINGLE
		data[5] : 0 Software Trigger
		1 Hardware Trigger

		data[6] :0 Software gate
		1 Hardware gate
		data[7] :0 Interrupt Disable
		1 Interrupt Enable
		\| data[4] : 0 APCI1500_CONTINUOUS
		\| 1 APCI1500_SINGLE
		\| data[5] : 0 Software Trigger
		\| 1 Hardware Trigger
		\|
		\| data[6] :0 Software gate
		\| 1 Hardware gate
		\| data[7] :0 Interrupt Disable
		\| 1 Interrupt Enable
		+----------------------------------------------------------------------------+
		\| Output Parameters : -- \|
		+----------------------------------------------------------------------------+
		@@ -1836,22 +1836,22 @@ int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
		+----------------------------------------------------------------------------+
		\| Function Name : int i_APCI1500_StartStopTriggerTimerCounterWatchdog \|
		\| (struct comedi_device dev,struct comedi_subdevice s,
		struct comedi_insn insn,unsigned int data); \|
		\| struct comedi_insn insn,unsigned int data); \|
		+----------------------------------------------------------------------------+
		\| Task : Start / Stop or trigger the timer counter or Watchdog \|
		+----------------------------------------------------------------------------+
		\| Input Parameters : struct comedi_device *dev : Driver handle \|
		\| struct comedi_subdevice *s, :pointer to subdevice structure
		struct comedi_insn *insn :pointer to insn structure \|
		\| struct comedi_insn *insn :pointer to insn structure \|
		\| unsigned int *data : Data Pointer to read status \|
		data[0] : 0 Counter1/Timer1
		1 Counter2/Timer2
		2 Counter3/Watchdog
		data[1] : 0 start
		1 stop
		2 Trigger
		data[2] : 0 Counter
		1 Timer/Watchdog
		\| data[0] : 0 Counter1/Timer1
		\| 1 Counter2/Timer2
		\| 2 Counter3/Watchdog
		\| data[1] : 0 start
		\| 1 stop
		\| 2 Trigger
		\| data[2] : 0 Counter
		\| 1 Timer/Watchdog
		+----------------------------------------------------------------------------+
		\| Output Parameters : -- \|
		+----------------------------------------------------------------------------+
		@@ -2161,18 +2161,18 @@ int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev,
		+----------------------------------------------------------------------------+
		\| Function Name : int i_APCI1500_ReadCounterTimerWatchdog \|
		\| (struct comedi_device dev,struct comedi_subdevice s,struct comedi_insn *insn,
		unsigned int *data); \|
		\| unsigned int *data); \|
		+----------------------------------------------------------------------------+
		\| Task : Read The Watchdog \|
		+----------------------------------------------------------------------------+
		\| Input Parameters : struct comedi_device *dev : Driver handle \|
		\| struct comedi_subdevice *s, :pointer to subdevice structure
		struct comedi_insn *insn :pointer to insn structure \|
		\| struct comedi_insn *insn :pointer to insn structure \|
		\| unsigned int *data : Data Pointer to read status \|
		data[0] : 0 Counter1/Timer1
		1 Counter2/Timer2
		2 Counter3/Watchdog

		\| data[0] : 0 Counter1/Timer1
		\| 1 Counter2/Timer2
		\| 2 Counter3/Watchdog
		\|
		+----------------------------------------------------------------------------+
		\| Output Parameters : -- \|
		+----------------------------------------------------------------------------+
		@@ -2352,13 +2352,13 @@ int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
		+----------------------------------------------------------------------------+
		\| Function Name : int i_APCI1500_ReadInterruptMask \|
		\| (struct comedi_device dev,struct comedi_subdevice s,struct comedi_insn *insn,
		unsigned int *data); \|
		\| unsigned int *data); \|
		+----------------------------------------------------------------------------+
		\| Task : Read the interrupt mask \|
		+----------------------------------------------------------------------------+
		\| Input Parameters : struct comedi_device *dev : Driver handle \|
		\| struct comedi_subdevice *s, :pointer to subdevice structure
		struct comedi_insn *insn :pointer to insn structure \|
		\| struct comedi_insn *insn :pointer to insn structure \|
		\| unsigned int *data : Data Pointer to read status \|


		@@ -2383,15 +2383,15 @@ int i_APCI1500_ReadInterruptMask(struct comedi_device *dev, struct comedi_subdev
		+----------------------------------------------------------------------------+
		\| Function Name : int i_APCI1500_ConfigureInterrupt \|
		\| (struct comedi_device dev,struct comedi_subdevice s,struct comedi_insn *insn,
		unsigned int *data); \|
		\| unsigned int *data); \|
		+----------------------------------------------------------------------------+
		\| Task : Configures the interrupt registers \|
		+----------------------------------------------------------------------------+
		\| Input Parameters : struct comedi_device *dev : Driver handle \|
		\| struct comedi_subdevice *s, :pointer to subdevice structure
		struct comedi_insn *insn :pointer to insn structure \|
		\| struct comedi_insn *insn :pointer to insn structure \|
		\| unsigned int *data : Data Pointer \|

		\|

		+----------------------------------------------------------------------------+
		\| Output Parameters : --

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

+17 −17

File changed.

Preview size limit exceeded, changes collapsed.

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

+11 −11

Original line number	Diff line number	Diff line
		@@ -363,14 +363,14 @@ int i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
		/*
		+----------------------------------------------------------------------------+
		\| Function Name : int i_APCI2032_ConfigWatchdog(comedi_device
		dev,struct comedi_subdevice s,struct comedi_insn insn,unsigned int data)\|
		\| dev,struct comedi_subdevice s,struct comedi_insn insn,unsigned int data)\|
		\| \|
		+----------------------------------------------------------------------------+
		\| Task : Configures The Watchdog \|
		+----------------------------------------------------------------------------+
		\| Input Parameters : struct comedi_device *dev : Driver handle \|
		\| struct comedi_subdevice *s, :pointer to subdevice structure
		struct comedi_insn *insn :pointer to insn structure \|
		\| struct comedi_insn *insn :pointer to insn structure \|
		\| unsigned int *data : Data Pointer to read status \|
		+----------------------------------------------------------------------------+
		\| Output Parameters : -- \|
		@@ -449,13 +449,13 @@ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_s
		+----------------------------------------------------------------------------+
		\| Function Name : int i_APCI2032_ReadWatchdog \|
		\| (struct comedi_device dev,struct comedi_subdevice s,struct comedi_insn *insn,
		unsigned int *data); \|
		\| unsigned int *data); \|
		+----------------------------------------------------------------------------+
		\| Task : Read The Watchdog \|
		+----------------------------------------------------------------------------+
		\| Input Parameters : struct comedi_device *dev : Driver handle \|
		\| struct comedi_subdevice *s, :pointer to subdevice structure
		struct comedi_insn *insn :pointer to insn structure \|
		\| struct comedi_insn *insn :pointer to insn structure \|
		\| unsigned int *data : Data Pointer to read status \|
		+----------------------------------------------------------------------------+
		\| Output Parameters : -- \|

Original line number	Diff line number	Diff line
		@@ -363,14 +363,14 @@ int i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
		/*
		+----------------------------------------------------------------------------+
		\| Function Name : int i_APCI2032_ConfigWatchdog(comedi_device
		dev,struct comedi_subdevice s,struct comedi_insn insn,unsigned int data)\|
		\| dev,struct comedi_subdevice s,struct comedi_insn insn,unsigned int data)\|
		\| \|
		+----------------------------------------------------------------------------+
		\| Task : Configures The Watchdog \|
		+----------------------------------------------------------------------------+
		\| Input Parameters : struct comedi_device *dev : Driver handle \|
		\| struct comedi_subdevice *s, :pointer to subdevice structure
		struct comedi_insn *insn :pointer to insn structure \|
		\| struct comedi_insn *insn :pointer to insn structure \|
		\| unsigned int *data : Data Pointer to read status \|
		+----------------------------------------------------------------------------+
		\| Output Parameters : -- \|
		@@ -449,13 +449,13 @@ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_s
		+----------------------------------------------------------------------------+
		\| Function Name : int i_APCI2032_ReadWatchdog \|
		\| (struct comedi_device dev,struct comedi_subdevice s,struct comedi_insn *insn,
		unsigned int *data); \|
		\| unsigned int *data); \|
		+----------------------------------------------------------------------------+
		\| Task : Read The Watchdog \|
		+----------------------------------------------------------------------------+
		\| Input Parameters : struct comedi_device *dev : Driver handle \|
		\| struct comedi_subdevice *s, :pointer to subdevice structure
		struct comedi_insn *insn :pointer to insn structure \|
		\| struct comedi_insn *insn :pointer to insn structure \|
		\| unsigned int *data : Data Pointer to read status \|
		+----------------------------------------------------------------------------+
		\| Output Parameters : -- \|