Staging: comedi: addi-data header file cleanups

Clean up lots of coding style issues in the addi-data header files. Cc: David Schleef <ds@schleef.org> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Staging: comedi: addi-data header file cleanups
Clean up lots of coding style issues in the addi-data header files. Cc: David Schleef <ds@schleef.org> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
15d8826a · Greg Kroah-Hartman · 851a2c10 · 15d8826a · 15d8826a · 15d8826a
Commit 15d8826a authored Feb 19, 2009 by Greg Kroah-Hartman
27 changed files
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 #define APCI1710_PCI_BUS_CLOCK 			0
 #define APCI1710_FRONT_CONNECTOR_INPUT 		1
@@ -32,53 +25,49 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 #define APCI1710_TIMER_READINTERRUPT		1
 #define APCI1710_TIMER_READALLTIMER		2
-// BEGIN JK 27.10.03 : Add the possibility to use a 40 Mhz quartz
+/* BEGIN JK 27.10.03 : Add the possibility to use a 40 Mhz quartz */
 #ifndef APCI1710_10MHZ
 #define APCI1710_10MHZ	10
 #endif
-// END JK 27.10.03 : Add the possibility to use a 40 Mhz quartz
+/* END JK 27.10.03 : Add the possibility to use a 40 Mhz quartz */
 /*
-+----------------------------------------------------------------------------+
+ * 82X54 TIMER INISIALISATION FUNCTION
-|                       82X54 TIMER INISIALISATION FUNCTION                  |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnConfigInitTimer(comedi_device *dev, comedi_subdevice *s,
-*/
+				   comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnConfigInitTimer(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1710_InsnWriteEnableDisableTimer(comedi_device *dev,
-	comedi_insn * insn, lsampl_t * data);
+					   comedi_subdevice *s,
+					   comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnWriteEnableDisableTimer(comedi_device * dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
 /*
-+----------------------------------------------------------------------------+
+ * 82X54 READ FUNCTION
-|                       82X54 READ FUNCTION                                  |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnReadAllTimerValue(comedi_device *dev, comedi_subdevice *s,
-*/
+				     comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnReadAllTimerValue(comedi_device * dev, comedi_subdevice * s,
-	comedi_insn * insn, lsampl_t * data);
-INT i_APCI1710_InsnBitsTimer(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1710_InsnBitsTimer(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			     comedi_insn *insn, lsampl_t *data);
 /*
-+----------------------------------------------------------------------------+
+ * 82X54 READ & WRITE FUNCTION
-|                       82X54 READ & WRITE FUNCTION                          |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_ReadTimerValue(comedi_device *dev,
-*/
+			      BYTE b_ModulNbr, BYTE b_TimerNbr,
-INT i_APCI1710_ReadTimerValue(comedi_device * dev,
+			      PULONG pul_TimerValue);
-	BYTE b_ModulNbr, BYTE b_TimerNbr, PULONG pul_TimerValue);
-INT i_APCI1710_GetTimerOutputLevel(comedi_device * dev,
+INT i_APCI1710_GetTimerOutputLevel(comedi_device *dev,
-	BYTE b_ModulNbr, BYTE b_TimerNbr, PBYTE pb_OutputLevel);
+				   BYTE b_ModulNbr, BYTE b_TimerNbr,
+				   PBYTE pb_OutputLevel);
-INT i_APCI1710_GetTimerProgressStatus(comedi_device * dev,
+INT i_APCI1710_GetTimerProgressStatus(comedi_device *dev,
-	BYTE b_ModulNbr, BYTE b_TimerNbr, PBYTE pb_TimerStatus);
+				      BYTE b_ModulNbr, BYTE b_TimerNbr,
+				      PBYTE pb_TimerStatus);
 /*
-+----------------------------------------------------------------------------+
+ * 82X54 WRITE FUNCTION
-|                       82X54 WRITE FUNCTION                                 |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_WriteTimerValue(comedi_device *dev,
-*/
+			       BYTE b_ModulNbr, BYTE b_TimerNbr,
-INT i_APCI1710_WriteTimerValue(comedi_device * dev,
+			       ULONG ul_WriteValue);
-	BYTE b_ModulNbr, BYTE b_TimerNbr, ULONG ul_WriteValue);
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 #define APCI1710_30MHZ			30
 #define APCI1710_33MHZ			33
@@ -40,46 +33,42 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 #define APCI1710_CHRONO_READ_PORT	3
 /*
-+----------------------------------------------------------------------------+
+ * CHRONOMETER INISIALISATION FUNCTION
-|                  CHRONOMETER INISIALISATION FUNCTION   |
-+----------------------------------------------------------------------------+
 */
+INT i_APCI1710_InsnConfigInitChrono(comedi_device *dev, comedi_subdevice *s,
+				    comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnConfigInitChrono(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device *dev,
-	comedi_insn * insn, lsampl_t * data);
+					    comedi_subdevice *s,
+					    comedi_insn *insn,
-INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device * dev,
+					    lsampl_t *data);
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
 /*
-+----------------------------------------------------------------------------+
+ * CHRONOMETER READ FUNCTION
-|                       CHRONOMETER READ FUNCTION                            |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnReadChrono(comedi_device *dev, comedi_subdevice *s,
-*/
+			      comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnReadChrono(comedi_device * dev, comedi_subdevice * s,
-	comedi_insn * insn, lsampl_t * data);
-INT i_APCI1710_GetChronoProgressStatus(comedi_device * dev,
+INT i_APCI1710_GetChronoProgressStatus(comedi_device *dev,
 				       BYTE b_ModulNbr, PBYTE pb_ChronoStatus);
-INT i_APCI1710_ReadChronoValue(comedi_device * dev,
+INT i_APCI1710_ReadChronoValue(comedi_device *dev,
 			       BYTE b_ModulNbr,
-	UINT ui_TimeOut, PBYTE pb_ChronoStatus, PULONG pul_ChronoValue);
+			       UINT ui_TimeOut, PBYTE pb_ChronoStatus,
+			       PULONG pul_ChronoValue);
-INT i_APCI1710_ConvertChronoValue(comedi_device * dev,
+INT i_APCI1710_ConvertChronoValue(comedi_device *dev,
 				  BYTE b_ModulNbr,
 				  ULONG ul_ChronoValue,
 				  PULONG pul_Hour,
 				  PBYTE pb_Minute,
 				  PBYTE pb_Second,
-	PUINT pui_MilliSecond, PUINT pui_MicroSecond, PUINT pui_NanoSecond);
+				  PUINT pui_MilliSecond, PUINT pui_MicroSecond,
+				  PUINT pui_NanoSecond);
 /*
-+----------------------------------------------------------------------------+
+ * CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION
-|                       CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION                  |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnBitsChronoDigitalIO(comedi_device *dev,
-*/
+				       comedi_subdevice *s, comedi_insn *insn,
+				       lsampl_t *data);
-INT i_APCI1710_InsnBitsChronoDigitalIO(comedi_device * dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#define APCI1710_ON			1	/* Digital  Output ON or OFF */
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
-#define		APCI1710_ON				1	// Digital  Output ON or OFF
 #define APCI1710_OFF			0
-#define		APCI1710_INPUT			0	// Digital I/O
+#define APCI1710_INPUT			0	/* Digital I/O */
 #define APCI1710_OUTPUT			1
-#define         APCI1710_DIGIO_MEMORYONOFF  0x10	//
+#define APCI1710_DIGIO_MEMORYONOFF	0x10
 #define APCI1710_DIGIO_INIT		0x11
 /*
-+----------------------------------------------------------------------------+
+ * DIGITAL I/O INISIALISATION FUNCTION
-|                       DIGITAL I/O INISIALISATION FUNCTION                  |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnConfigDigitalIO(comedi_device *dev, comedi_subdevice *s,
-*/
+				   comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s,
-	comedi_insn * insn, lsampl_t * data);
 /*
-+----------------------------------------------------------------------------+
+ * INPUT OUTPUT  FUNCTIONS
-|                            INPUT OUTPUT  FUNCTIONS                         |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device *dev,
-*/
+					 comedi_subdevice *s,
-INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device * dev,
+					 comedi_insn *insn, lsampl_t *data);
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device *dev,
-INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev,
+					  comedi_subdevice *s,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+					  comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device * dev,
+INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+					  comedi_subdevice *s,
+					  comedi_insn *insn, lsampl_t *data);
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 #define APCI1710_SINGLE			0
 #define APCI1710_CONTINUOUS		1
@@ -28,25 +21,27 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 #define APCI1710_PULSEENCODER_READ	0
 #define APCI1710_PULSEENCODER_WRITE	1
-INT i_APCI1710_InsnConfigInitPulseEncoder(comedi_device * dev,
+INT i_APCI1710_InsnConfigInitPulseEncoder(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+					  comedi_subdevice *s,
+					  comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(comedi_device * dev,
+INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+						  comedi_subdevice *s,
-/*
+						  comedi_insn *insn,
-+----------------------------------------------------------------------------+
+						  lsampl_t *data);
-|                       READ PULSE ENCODER FUNCTIONS                         |
-+----------------------------------------------------------------------------+
-*/
-INT i_APCI1710_InsnReadInterruptPulseEncoder(comedi_device * dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
 /*
-+----------------------------------------------------------------------------+
+ * READ PULSE ENCODER FUNCTIONS
-|                       WRITE PULSE ENCODER FUNCTIONS                        |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnReadInterruptPulseEncoder(comedi_device *dev,
-*/
+					     comedi_subdevice *s,
+					     comedi_insn *insn,
+					     lsampl_t *data);
-INT i_APCI1710_InsnBitsReadWritePulseEncoder(comedi_device * dev,
+/*
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+ * WRITE PULSE ENCODER FUNCTIONS
+ */
+INT i_APCI1710_InsnBitsReadWritePulseEncoder(comedi_device *dev,
+					     comedi_subdevice *s,
+					     comedi_insn *insn,
+					     lsampl_t *data);
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 #define APCI1710_30MHZ		30
 #define APCI1710_33MHZ		33
@@ -33,10 +26,10 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 #define APCI1710_PWM_ENABLE		1
 #define APCI1710_PWM_NEWTIMING		2
-INT i_APCI1710_InsnConfigPWM(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1710_InsnConfigPWM(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			     comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InitPWM(comedi_device * dev,
+INT i_APCI1710_InitPWM(comedi_device *dev,
 		       BYTE b_ModulNbr,
 		       BYTE b_PWM,
 		       BYTE b_ClockSelection,
@@ -45,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(comedi_device *dev,
 				    BYTE b_ModulNbr,
 				    BYTE b_PWM,
 				    PBYTE pb_TimingUnit,
@@ -54,26 +47,30 @@ INT i_APCI1710_GetPWMInitialisation(comedi_device * dev,
 				    PBYTE pb_StartLevel,
 				    PBYTE pb_StopMode,
 				    PBYTE pb_StopLevel,
-	PBYTE pb_ExternGate, PBYTE pb_InterruptEnable, PBYTE pb_Enable);
+				    PBYTE pb_ExternGate,
+				    PBYTE pb_InterruptEnable, PBYTE pb_Enable);
-INT i_APCI1710_InsnWritePWM(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1710_InsnWritePWM(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			    comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_EnablePWM(comedi_device * dev,
+INT i_APCI1710_EnablePWM(comedi_device *dev,
 			 BYTE b_ModulNbr,
 			 BYTE b_PWM,
 			 BYTE b_StartLevel,
 			 BYTE b_StopMode,
-	BYTE b_StopLevel, BYTE b_ExternGate, BYTE b_InterruptEnable);
+			 BYTE b_StopLevel, BYTE b_ExternGate,
+			 BYTE b_InterruptEnable);
-INT i_APCI1710_SetNewPWMTiming(comedi_device * dev,
+INT i_APCI1710_SetNewPWMTiming(comedi_device *dev,
 			       BYTE b_ModulNbr,
-	BYTE b_PWM, BYTE b_TimingUnit, ULONG ul_LowTiming, ULONG ul_HighTiming);
+			       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(comedi_device *dev, BYTE b_ModulNbr, BYTE b_PWM);
-INT i_APCI1710_InsnReadGetPWMStatus(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1710_InsnReadGetPWMStatus(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				    comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnBitsReadPWMInterrupt(comedi_device * dev,
+INT i_APCI1710_InsnBitsReadPWMInterrupt(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+					comedi_subdevice *s,
+					comedi_insn *insn, lsampl_t *data);
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 #define APCI1710_30MHZ		30
 #define APCI1710_33MHZ		33
@@ -38,15 +31,13 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 #define APCI1710_SSI_READ_ALLCHANNEL	3
 /*
-+----------------------------------------------------------------------------+
+ * SSI INISIALISATION FUNCTION
-|                       SSI INISIALISATION FUNCTION                          |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnConfigInitSSI(comedi_device *dev, comedi_subdevice *s,
-*/
+				 comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnConfigInitSSI(comedi_device * dev, comedi_subdevice * s,
-	comedi_insn * insn, lsampl_t * data);
-INT i_APCI1710_InsnReadSSIValue(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1710_InsnReadSSIValue(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnBitsSSIDigitalIO(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1710_InsnBitsSSIDigitalIO(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				    comedi_insn *insn, lsampl_t *data);
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 #define APCI1710_30MHZ		30
 #define APCI1710_33MHZ		33
@@ -40,24 +33,25 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 #define APCI1710_TOR_READINTERRUPT	2
 /*
-+----------------------------------------------------------------------------+
+ * TOR_COUNTER INISIALISATION FUNCTION
-|                       TOR_COUNTER INISIALISATION FUNCTION                  |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnConfigInitTorCounter(comedi_device *dev,
-*/
+					comedi_subdevice *s,
+					comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnConfigInitTorCounter(comedi_device * dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+INT i_APCI1710_InsnWriteEnableDisableTorCounter(comedi_device *dev,
+						comedi_subdevice *s,
-INT i_APCI1710_InsnWriteEnableDisableTorCounter(comedi_device * dev,
+						comedi_insn *insn,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+						lsampl_t *data);
-INT i_APCI1710_InsnReadGetTorCounterInitialisation(comedi_device * dev,
+INT i_APCI1710_InsnReadGetTorCounterInitialisation(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+						   comedi_subdevice *s,
+						   comedi_insn *insn,
+						   lsampl_t *data);
 /*
-+----------------------------------------------------------------------------+
+ * TOR_COUNTER READ FUNCTION
-|                       TOR_COUNTER READ FUNCTION                            |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(comedi_device *dev,
-*/
+							   comedi_subdevice *s,
+							   comedi_insn *insn,
-INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(comedi_device * dev,
+							   lsampl_t *data);
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 #define APCI1710_TTL_INIT		0
 #define APCI1710_TTL_INITDIRECTION	1
@@ -29,28 +22,23 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 #define APCI1710_TTL_READPORT		1
 /*
-+----------------------------------------------------------------------------+
+ * TTL INISIALISATION FUNCTION
-|                       TTL INISIALISATION FUNCTION                          |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnConfigInitTTLIO(comedi_device *dev, comedi_subdevice *s,
-*/
+				   comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnConfigInitTTLIO(comedi_device * dev, comedi_subdevice * s,
-	comedi_insn * insn, lsampl_t * data);
 /*
-+----------------------------------------------------------------------------+
+ * TTL INPUT FUNCTION
-|                       TTL INPUT FUNCTION                                   |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnBitsReadTTLIO(comedi_device *dev, comedi_subdevice *s,
-*/
+				 comedi_insn *insn, lsampl_t *data);
+INT i_APCI1710_InsnReadTTLIOAllPortValue(comedi_device *dev,
+					 comedi_subdevice *s,
+					 comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnBitsReadTTLIO(comedi_device * dev, comedi_subdevice * s,
-	comedi_insn * insn, lsampl_t * data);
-INT i_APCI1710_InsnReadTTLIOAllPortValue(comedi_device * dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
 /*
-+----------------------------------------------------------------------------+
+ * TTL OUTPUT FUNCTIONS
-|                            TTL OUTPUT FUNCTIONS                            |
+ */
-+----------------------------------------------------------------------------+
+INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(comedi_device *dev,
-*/
+					 comedi_subdevice *s,
+					 comedi_insn *insn, lsampl_t *data);
-INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(comedi_device * dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
--- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h
-/**
-@verbatim
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-        ADDI-DATA GmbH
-        Dieselstrasse 3
-        D-77833 Ottersweier
-        Tel: +19(0)7223/9493-0
-        Fax: +49(0)7223/9493-92
-        http://www.addi-data-com
-        info@addi-data.com
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 /*
-#define VOID           void
+ *  Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-#define INT            int
+ *
-#define UINT           unsigned int
+ *	ADDI-DATA GmbH
-#define SHORT          short
+ *	Dieselstrasse 3
-#define USHORT         unsigned short
+ *	D-77833 Ottersweier
-#define CHAR           char
+ *	Tel: +19(0)7223/9493-0
-#define BYTE           unsigned char
+ *	Fax: +49(0)7223/9493-92
-#define WORD           unsigned int
+ *	http://www.addi-data-com
-#define LONG           long
+ *	info@addi-data.com
-#define ULONG          unsigned long
+ *
-#define DWORD          unsigned long
+ * This program is free software; you can redistribute it and/or modify it
-#define DOUBLE         double
+ * under the terms of the GNU General Public License as published by the Free
-#define PINT           int *
+ * Software Foundation; either version 2 of the License, or (at your option)
-#define PUINT          unsigned int *
+ * any later version.
-#define PSHORT         short *
+ */
-#define PUSHORT        unsigned short *
-#define PCHAR          char *
-#define PBYTE          unsigned char *
-#define PWORD          unsigned int *
-#define PLONG          long *
-#define PULONG         unsigned long *
-#define PDWORD         unsigned long *
-#define PDOUBLE        double *
-*/
 #define AMCC_OP_REG_MCSR	0x3c
 #define EEPROM_BUSY		0x80000000
-#define NVCMD_LOAD_LOW  (0x4 << 5 )	// nvRam load low command
+#define NVCMD_LOAD_LOW		(0x4 << 5)	/* nvRam load low command */
-#define NVCMD_LOAD_HIGH (0x5 << 5 )	// nvRam load high command
+#define NVCMD_LOAD_HIGH		(0x5 << 5)	/* nvRam load high command */
-#define NVCMD_BEGIN_READ (0x7 << 5 )	// nvRam begin read command
+#define NVCMD_BEGIN_READ	(0x7 << 5)	/* nvRam begin read command */
-#define NVCMD_BEGIN_WRITE  (0x6 << 5)	//EEPROM begin write command
+#define NVCMD_BEGIN_WRITE	(0x6 << 5)	/* EEPROM begin write command */
 INT i_AddiHeaderRW_ReadEeprom(INT i_NbOfWordsToRead,
 			      DWORD dw_PCIBoardEepromAddress,

--- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
--- a/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h
+++ b/drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h
@@ -219,12 +219,16 @@ struct pcilst_struct *amcc_devices;	// ptr to root list of all amcc devices
 void v_pci_card_list_init(unsigned short pci_vendor, char display);
 void v_pci_card_list_cleanup(unsigned short pci_vendor);
 struct pcilst_struct *ptr_find_free_pci_card_by_device(unsigned short vendor_id,
-	unsigned short device_id);
+						       unsigned short
+						       device_id);
 int i_find_free_pci_card_by_position(unsigned short vendor_id,
-	unsigned short device_id, unsigned short pci_bus,
+				     unsigned short device_id,
-	unsigned short pci_slot, struct pcilst_struct **card);
+				     unsigned short pci_bus,
+				     unsigned short pci_slot,
+				     struct pcilst_struct **card);
 struct pcilst_struct *ptr_select_and_alloc_pci_card(unsigned short vendor_id,
-	unsigned short device_id, unsigned short pci_bus,
+						    unsigned short device_id,
+						    unsigned short pci_bus,
 						    unsigned short pci_slot);
 int i_pci_card_alloc(struct pcilst_struct *amcc);
@@ -232,8 +236,8 @@ int i_pci_card_free(struct pcilst_struct *amcc);
 void v_pci_card_list_display(void);
 int i_pci_card_data(struct pcilst_struct *amcc,
 		    unsigned char *pci_bus, unsigned char *pci_slot,
-	unsigned char *pci_func, unsigned short *io_addr, unsigned short *irq,
+		    unsigned char *pci_func, unsigned short *io_addr,
-	unsigned short *master);
+		    unsigned short *irq, unsigned short *master);
 /****************************************************************************/
@@ -332,8 +336,10 @@ struct pcilst_struct *ptr_find_free_pci_card_by_device(unsigned short vendor_id,
 /****************************************************************************/
 /* find card on requested position */
 int i_find_free_pci_card_by_position(unsigned short vendor_id,
-	unsigned short device_id, unsigned short pci_bus,
+				     unsigned short device_id,
-	unsigned short pci_slot, struct pcilst_struct **card)
+				     unsigned short pci_bus,
+				     unsigned short pci_slot,
+				     struct pcilst_struct **card)
 {
 	struct pcilst_struct *amcc, *next;
@@ -395,7 +401,11 @@ void v_pci_card_list_display(void)
 	for (amcc = amcc_devices; amcc; amcc = next) {
 		next = amcc->next;
-		printk("%2d   %2d   %2d  0x%4x 0x%4x   %3s   0x%4x 0x%4x  %2d  %2d\n", amcc->pci_bus, amcc->pci_slot, amcc->pci_func, amcc->vendor, amcc->device, amcc->master ? "yes" : "no", amcc->io_addr[0], amcc->io_addr[2], amcc->irq, amcc->used);
+		printk
+		    ("%2d   %2d   %2d  0x%4x 0x%4x   %3s   0x%4x 0x%4x  %2d  %2d\n",
+		     amcc->pci_bus, amcc->pci_slot, amcc->pci_func,
+		     amcc->vendor, amcc->device, amcc->master ? "yes" : "no",
+		     amcc->io_addr[0], amcc->io_addr[2], amcc->irq, amcc->used);
 	}
 }
@@ -404,8 +414,8 @@ void v_pci_card_list_display(void)
 /* return all card information for driver */
 int i_pci_card_data(struct pcilst_struct *amcc,
 		    unsigned char *pci_bus, unsigned char *pci_slot,
-	unsigned char *pci_func, unsigned short *io_addr, unsigned short *irq,
+		    unsigned char *pci_func, unsigned short *io_addr,
-	unsigned short *master)
+		    unsigned short *irq, unsigned short *master)
 {
 	int i;
@@ -424,20 +434,23 @@ int i_pci_card_data(struct pcilst_struct *amcc,
 /****************************************************************************/
 /* select and alloc card */
 struct pcilst_struct *ptr_select_and_alloc_pci_card(unsigned short vendor_id,
-	unsigned short device_id, unsigned short pci_bus,
+						    unsigned short device_id,
+						    unsigned short pci_bus,
 						    unsigned short pci_slot)
 {
 	struct pcilst_struct *card;
 	if ((pci_bus < 1) & (pci_slot < 1)) {	// use autodetection
 		if ((card = ptr_find_free_pci_card_by_device(vendor_id,
-					device_id)) == NULL) {
+							     device_id)) ==
+		    NULL) {
 			rt_printk(" - Unused card not found in system!\n");
 			return NULL;
 		}
 	} else {
 		switch (i_find_free_pci_card_by_position(vendor_id, device_id,
-				pci_bus, pci_slot, &card)) {
+							 pci_bus, pci_slot,
+							 &card)) {
 		case 1:
 			rt_printk
 			    (" - Card not found on requested position b:s %d:%d!\n",

--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 #define COMEDI_SUBD_TTLIO		11	/* Digital Input Output But TTL */
 #define COMEDI_SUBD_PWM			12	/* Pulse width Measurement */

--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+/* Card Specific information */
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
-// Card Specific information
 #define APCI035_BOARD_VENDOR_ID		0x15B8
 #define APCI035_ADDRESS_RANGE		255
@@ -39,7 +33,7 @@ struct {
 	INT i_ModuleSelection;
 } Config_Parameters_Main;
-//ANALOG INPUT RANGE
+/* ANALOG INPUT RANGE */
 comedi_lrange range_apci035_ai = { 8, {
 				       BIP_RANGE(10),
 				       BIP_RANGE(5),
@@ -52,8 +46,7 @@ comedi_lrange range_apci035_ai = { 8, {
 				       }
 };
-// Timer / Watchdog Related Defines
+/* Timer / Watchdog Related Defines */
 #define APCI035_TCW_SYNC_ENABLEDISABLE	0
 #define APCI035_TCW_RELOAD_VALUE	4
 #define APCI035_TCW_TIMEBASE		8
@@ -64,7 +57,7 @@ comedi_lrange range_apci035_ai = { 8, {
 #define APCI035_TCW_WARN_TIMEBASE	28
 #define ADDIDATA_TIMER			0
-//#define ADDIDATA_WATCHDOG                         1
+/* #define ADDIDATA_WATCHDOG		1 */
 #define APCI035_TW1                               0
 #define APCI035_TW2                               32
@@ -100,30 +93,31 @@ comedi_lrange range_apci035_ai = { 8, {
 #define ADDIDATA_UNIPOLAR                        1
 #define ADDIDATA_BIPOLAR                         2
-//ADDIDATA Enable Disable
+/* ADDIDATA Enable Disable */
 #define ADDIDATA_ENABLE				1
 #define ADDIDATA_DISABLE			0
-// Hardware Layer  functions for Apci035
+/* Hardware Layer functions for Apci035 */
-// TIMER
+/* TIMER */
-// timer value is passed as u seconds
+/* timer value is passed as u seconds */
-INT i_APCI035_ConfigTimerWatchdog(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI035_ConfigTimerWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				  comedi_insn *insn, lsampl_t *data);
-INT i_APCI035_StartStopWriteTimerWatchdog(comedi_device * dev,
+INT i_APCI035_StartStopWriteTimerWatchdog(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+					  comedi_subdevice *s,
-INT i_APCI035_ReadTimerWatchdog(comedi_device * dev, comedi_subdevice * s,
+					  comedi_insn *insn, lsampl_t *data);
-	comedi_insn * insn, lsampl_t * data);
+INT i_APCI035_ReadTimerWatchdog(comedi_device *dev, comedi_subdevice *s,
+				comedi_insn *insn, lsampl_t *data);
-//Temperature Related Defines (Analog Input Subdevice)
+/* Temperature Related Defines (Analog Input Subdevice) */
-INT i_APCI035_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI035_ConfigAnalogInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				comedi_insn *insn, lsampl_t *data);
-INT i_APCI035_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI035_ReadAnalogInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			      comedi_insn *insn, lsampl_t *data);
-//Interrupt
+/* Interrupt */
 static void v_APCI035_Interrupt(int irq, void *d);
-//Reset functions
+/* Reset functions */
-INT i_APCI035_Reset(comedi_device * dev);
+INT i_APCI035_Reset(comedi_device *dev);
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 /*********      Definitions for APCI-1032 card  *****/
@@ -54,17 +47,17 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 //DI
 // for di read
-INT i_APCI1032_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1032_ConfigDigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				  comedi_insn *insn, lsampl_t *data);
-INT i_APCI1032_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1032_Read1DigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				 comedi_insn *insn, lsampl_t *data);
-INT i_APCI1032_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1032_ReadMoreDigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				    comedi_insn *insn, lsampl_t *data);
 // Interrupt functions.....
 static VOID v_APCI1032_Interrupt(int irq, void *d);
 //Reset
-INT i_APCI1032_Reset(comedi_device * dev);
+INT i_APCI1032_Reset(comedi_device *dev);
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 /*********      Definitions for APCI-1500 card  *****/
@@ -53,9 +46,10 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 #define  START                       		    0
 #define  STOP                       		    1
 #define  TRIGGER                       		    2
-   /**************************/
-   /* Zillog I/O enumeration */
+/*
-   /**************************/
+ * Zillog I/O enumeration
+ */
 enum {
 	APCI1500_Z8536_PORT_C,
 	APCI1500_Z8536_PORT_B,
@@ -63,10 +57,9 @@ enum {
 	APCI1500_Z8536_CONTROL_REGISTER
 };
-      /******************************/
+/*
-      /* Z8536 CIO Internal Address */
+ * Z8536 CIO Internal Address
-      /******************************/
+ */
 enum {
 	APCI1500_RW_MASTER_INTERRUPT_CONTROL,
 	APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
@@ -123,35 +116,50 @@ enum {
 };
 /*----------DIGITAL INPUT----------------*/
-static int i_APCI1500_Initialisation(comedi_device * dev, comedi_subdevice * s,
+static int i_APCI1500_Initialisation(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				     comedi_insn *insn, lsampl_t *data);
-static int i_APCI1500_ConfigDigitalInputEvent(comedi_device * dev,
+static int i_APCI1500_ConfigDigitalInputEvent(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+					      comedi_subdevice *s,
+					      comedi_insn *insn,
-static int i_APCI1500_StartStopInputEvent(comedi_device * dev,
+					      lsampl_t *data);
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
-static int i_APCI1500_ReadMoreDigitalInput(comedi_device * dev,
+static int i_APCI1500_StartStopInputEvent(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+					  comedi_subdevice *s,
+					  comedi_insn *insn, lsampl_t *data);
+static int i_APCI1500_ReadMoreDigitalInput(comedi_device *dev,
+					   comedi_subdevice *s,
+					   comedi_insn *insn, lsampl_t *data);
 /*----------	DIGITAL OUTPUT------------*/
-static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(comedi_device * dev,
+static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+							comedi_subdevice *s,
-static int i_APCI1500_WriteDigitalOutput(comedi_device * dev,
+							comedi_insn *insn,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+							lsampl_t *data);
+static int i_APCI1500_WriteDigitalOutput(comedi_device *dev,
+					 comedi_subdevice *s,
+					 comedi_insn *insn, lsampl_t *data);
 /*----------TIMER----------------*/
-static int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device * dev,
+static int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+						 comedi_subdevice *s,
-static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(comedi_device * dev,
+						 comedi_insn *insn,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+						 lsampl_t *data);
-static int i_APCI1500_ReadCounterTimerWatchdog(comedi_device * dev,
+static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+							   comedi_subdevice *s,
-static int i_APCI1500_ReadInterruptMask(comedi_device * dev,
+							   comedi_insn *insn,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+							   lsampl_t *data);
+static int i_APCI1500_ReadCounterTimerWatchdog(comedi_device *dev,
+					       comedi_subdevice *s,
+					       comedi_insn *insn,
+					       lsampl_t *data);
+static int i_APCI1500_ReadInterruptMask(comedi_device *dev,
+					comedi_subdevice *s,
+					comedi_insn *insn, lsampl_t *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(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+					 comedi_subdevice *s,
+					 comedi_insn *insn, lsampl_t *data);
 /*----------RESET---------------*/
-static int i_APCI1500_Reset(comedi_device * dev);
+static int i_APCI1500_Reset(comedi_device *dev);
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 /*********      Definitions for APCI-1516 card  *****/
@@ -45,27 +38,27 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 // Hardware Layer  functions for Apci1516
 //Digital Input
-INT i_APCI1516_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1516_ReadMoreDigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				    comedi_insn *insn, lsampl_t *data);
-INT i_APCI1516_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1516_Read1DigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				 comedi_insn *insn, lsampl_t *data);
 //Digital Output
-int i_APCI1516_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI1516_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				   comedi_insn *insn, lsampl_t *data);
-INT i_APCI1516_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1516_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				  comedi_insn *insn, lsampl_t *data);
-INT i_APCI1516_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1516_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				 comedi_insn *insn, lsampl_t *data);
 // TIMER
 // timer value is passed as u seconds
-int i_APCI1516_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s,
+int i_APCI1516_ConfigWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			      comedi_insn *insn, lsampl_t *data);
-int i_APCI1516_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s,
+int i_APCI1516_StartStopWriteWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				      comedi_insn *insn, lsampl_t *data);
-int i_APCI1516_ReadWatchdog(comedi_device * dev, comedi_subdevice * s,
+int i_APCI1516_ReadWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			    comedi_insn *insn, lsampl_t *data);
 //reset
-INT i_APCI1516_Reset(comedi_device * dev);
+INT i_APCI1516_Reset(comedi_device *dev);
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 /*********      Definitions for APCI-1564 card  *****/
@@ -89,34 +82,38 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 //DI
 // for di read
-INT i_APCI1564_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1564_ConfigDigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				  comedi_insn *insn, lsampl_t *data);
-INT i_APCI1564_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1564_Read1DigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				 comedi_insn *insn, lsampl_t *data);
-INT i_APCI1564_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1564_ReadMoreDigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				    comedi_insn *insn, lsampl_t *data);
 //DO
-int i_APCI1564_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI1564_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				   comedi_insn *insn, lsampl_t *data);
-INT i_APCI1564_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1564_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				  comedi_insn *insn, lsampl_t *data);
-INT i_APCI1564_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI1564_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				 comedi_insn *insn, lsampl_t *data);
-int i_APCI1564_ReadInterruptStatus(comedi_device * dev, comedi_subdevice * s,
+int i_APCI1564_ReadInterruptStatus(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				   comedi_insn *insn, lsampl_t *data);
 // TIMER
 // timer value is passed as u seconds
-INT i_APCI1564_ConfigTimerCounterWatchdog(comedi_device * dev,
+INT i_APCI1564_ConfigTimerCounterWatchdog(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+					  comedi_subdevice *s,
-int i_APCI1564_StartStopWriteTimerCounterWatchdog(comedi_device * dev,
+					  comedi_insn *insn, lsampl_t *data);
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+int i_APCI1564_StartStopWriteTimerCounterWatchdog(comedi_device *dev,
-int i_APCI1564_ReadTimerCounterWatchdog(comedi_device * dev,
+						  comedi_subdevice *s,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+						  comedi_insn *insn,
+						  lsampl_t *data);
+int i_APCI1564_ReadTimerCounterWatchdog(comedi_device *dev,
+					comedi_subdevice *s,
+					comedi_insn *insn, lsampl_t *data);
 // INTERRUPT
 static VOID v_APCI1564_Interrupt(int irq, void *d);
 // RESET
-INT i_APCI1564_Reset(comedi_device * dev);
+INT i_APCI1564_Reset(comedi_device *dev);
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 #ifndef COMEDI_SUBD_TTLIO
 #define COMEDI_SUBD_TTLIO   11	/* Digital Input Output But TTL */
@@ -69,8 +62,9 @@ static const comedi_lrange range_apci16xx_ttl = { 12,
 +----------------------------------------------------------------------------+
 */
-int i_APCI16XX_InsnConfigInitTTLIO(comedi_device * dev,
+int i_APCI16XX_InsnConfigInitTTLIO(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+				   comedi_subdevice *s, comedi_insn *insn,
+				   lsampl_t *data);
 /*
 +----------------------------------------------------------------------------+
@@ -78,11 +72,13 @@ int i_APCI16XX_InsnConfigInitTTLIO(comedi_device * dev,
 +----------------------------------------------------------------------------+
 */
-int i_APCI16XX_InsnBitsReadTTLIO(comedi_device * dev,
+int i_APCI16XX_InsnBitsReadTTLIO(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+				 comedi_subdevice *s, comedi_insn *insn,
+				 lsampl_t *data);
-int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device * dev,
+int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+					 comedi_subdevice *s,
+					 comedi_insn *insn, lsampl_t *data);
 /*
 +----------------------------------------------------------------------------+
@@ -90,8 +86,9 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device * dev,
 +----------------------------------------------------------------------------+
 */
-int i_APCI16XX_InsnBitsWriteTTLIO(comedi_device * dev,
+int i_APCI16XX_InsnBitsWriteTTLIO(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+				  comedi_subdevice *s, comedi_insn *insn,
+				  lsampl_t *data);
-int i_APCI16XX_Reset(comedi_device * dev);
+int i_APCI16XX_Reset(comedi_device *dev);
 #endif
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 /*********      Definitions for APCI-2016 card  *****/
 #define APCI2016_BOARD_VENDOR_ID 0x15B8
@@ -47,26 +40,26 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 // Hardware Layer  functions for Apci2016
 //DO
-int i_APCI2016_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2016_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				   comedi_insn *insn, lsampl_t *data);
-int i_APCI2016_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2016_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				  comedi_insn *insn, lsampl_t *data);
-int i_APCI2016_BitsDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2016_BitsDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				 comedi_insn *insn, lsampl_t *data);
 // TIMER
 // timer value is passed as u seconds
-int i_APCI2016_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2016_ConfigWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			      comedi_insn *insn, lsampl_t *data);
-int i_APCI2016_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2016_StartStopWriteWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				      comedi_insn *insn, lsampl_t *data);
-int i_APCI2016_ReadWatchdog(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2016_ReadWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			    comedi_insn *insn, lsampl_t *data);
 // Interrupt functions.....
@@ -74,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(comedi_device *dev);
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
+ *	D-77833 Ottersweier
+ *	Tel: +19(0)7223/9493-0
+ *	Fax: +49(0)7223/9493-92
+ *	http://www.addi-data-com
+ *	info@addi-data.com
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-        ADDI-DATA GmbH
-        Dieselstrasse 3
-        D-77833 Ottersweier
-        Tel: +19(0)7223/9493-0
-        Fax: +49(0)7223/9493-92
-        http://www.addi-data-com
-        info@addi-data.com
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 /*********      Definitions for APCI-2032 card  *****/
 // Card Specific information
@@ -61,27 +55,27 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 // Hardware Layer  functions for Apci2032
 //DO
-int i_APCI2032_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2032_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				   comedi_insn *insn, lsampl_t *data);
-INT i_APCI2032_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI2032_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				  comedi_insn *insn, lsampl_t *data);
-INT i_APCI2032_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI2032_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				 comedi_insn *insn, lsampl_t *data);
-int i_APCI2032_ReadInterruptStatus(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2032_ReadInterruptStatus(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				   comedi_insn *insn, lsampl_t *data);
 // TIMER
 // timer value is passed as u seconds
-INT i_APCI2032_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI2032_ConfigWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			      comedi_insn *insn, lsampl_t *data);
-int i_APCI2032_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2032_StartStopWriteWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				      comedi_insn *insn, lsampl_t *data);
-int i_APCI2032_ReadWatchdog(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2032_ReadWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			    comedi_insn *insn, lsampl_t *data);
 // Interrupt functions.....
 void v_APCI2032_Interrupt(int irq, void *d);
 //Reset functions
-int i_APCI2032_Reset(comedi_device * dev);
+int i_APCI2032_Reset(comedi_device *dev);
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
+ *	D-77833 Ottersweier
+ *	Tel: +19(0)7223/9493-0
+ *	Fax: +49(0)7223/9493-92
+ *	http://www.addi-data-com
+ *	info@addi-data.com
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-        ADDI-DATA GmbH
-        Dieselstrasse 3
-        D-77833 Ottersweier
-        Tel: +19(0)7223/9493-0
-        Fax: +49(0)7223/9493-92
-        http://www.addi-data-com
-        info@addi-data.com
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 /*********      Definitions for APCI-2200 card  *****/
 // Card Specific information
@@ -42,26 +36,26 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
 // Hardware Layer  functions for Apci2200
 //Digital Input
-INT i_APCI2200_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI2200_ReadMoreDigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				    comedi_insn *insn, lsampl_t *data);
-INT i_APCI2200_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI2200_Read1DigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				 comedi_insn *insn, lsampl_t *data);
 //Digital Output
-int i_APCI2200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2200_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				   comedi_insn *insn, lsampl_t *data);
-INT i_APCI2200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI2200_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				  comedi_insn *insn, lsampl_t *data);
-INT i_APCI2200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI2200_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				 comedi_insn *insn, lsampl_t *data);
 // TIMER
-int i_APCI2200_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2200_ConfigWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			      comedi_insn *insn, lsampl_t *data);
-int i_APCI2200_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2200_StartStopWriteWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				      comedi_insn *insn, lsampl_t *data);
-int i_APCI2200_ReadWatchdog(comedi_device * dev, comedi_subdevice * s,
+int i_APCI2200_ReadWatchdog(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			    comedi_insn *insn, lsampl_t *data);
 //reset
-INT i_APCI2200_Reset(comedi_device * dev);
+INT i_APCI2200_Reset(comedi_device *dev);
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
 // hwdrv_apci3120.h
-/**
-@verbatim
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-        ADDI-DATA GmbH
-        Dieselstrasse 3
-        D-77833 Ottersweier
-        Tel: +19(0)7223/9493-0
-        Fax: +49(0)7223/9493-92
-        http://www.addi-data-com
-        info@addi-data.com
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 /*
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-  +-----------------------------------------------------------------------+
+ *
-  | (C) ADDI-DATA GmbH          Dieselstrasse 3      D-77833 Ottersweier  |
+ *	ADDI-DATA GmbH
-  +-----------------------------------------------------------------------+
+ *	Dieselstrasse 3
-  | Tel : +49 (0) 7223/9493-0     | email    : info@addi-data.com         |
+ *	D-77833 Ottersweier
-  | Fax : +49 (0) 7223/9493-92    | Internet : http://www.addi-data.com   |
+ *	Tel: +19(0)7223/9493-0
-  +-----------------------------------------------------------------------+
+ *	Fax: +49(0)7223/9493-92
-  | Project   : ADDI DATA         | Compiler : GCC 			              |
+ *	http://www.addi-data-com
-  | Modulname : hwdrv_apci3120.h  | Version  : 2.96  Redhat Linux         |
+ *	info@addi-data.com
-  |                               |                    kernel-2.4.2       |
+ *
-  +-------------------------------+---------------------------------------+
+ * This program is free software; you can redistribute it and/or modify it
-  | Author    :           		  | Date     :                    		  |
+ * under the terms of the GNU General Public License as published by the Free
-  +-----------------------------------------------------------------------+
+ * Software Foundation; either version 2 of the License, or (at your option)
-  | Description :Header file for apci3120 hardware abstraction layer      |
+ * any later version.
-  +-----------------------------------------------------------------------+
+ */
-  |                             UPDATE'S                                  |
-  +-----------------------------------------------------------------------+
-  |   Date   |   Author  |          Description of updates                |
-  +----------+-----------+------------------------------------------------+
-  |          | 			 | 												  |
-  |          |           | 												  |
-  |          |           | 			                                      |
-  |          |           | 												  |
-  |          |           | 					                              |
-  +----------+-----------+------------------------------------------------+
-  | 	     | 			 | 						                          |
-  |          |           | 												  |
-  |          |           | 								                  |
-  +----------+-----------+------------------------------------------------+
-*/
 // comedi related defines
@@ -216,61 +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(comedi_device *dev, comedi_subdevice *s,
 				int n_chan, unsigned int *chanlist, char check);
-int i_APCI3120_ExttrigEnable(comedi_device * dev);
+int i_APCI3120_ExttrigEnable(comedi_device *dev);
-int i_APCI3120_ExttrigDisable(comedi_device * dev);
+int i_APCI3120_ExttrigDisable(comedi_device *dev);
-int i_APCI3120_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s);
+int i_APCI3120_StopCyclicAcquisition(comedi_device *dev, comedi_subdevice *s);
-int i_APCI3120_Reset(comedi_device * dev);
+int i_APCI3120_Reset(comedi_device *dev);
-int i_APCI3120_CyclicAnalogInput(int mode, comedi_device * dev,
+int i_APCI3120_CyclicAnalogInput(int mode, comedi_device *dev,
-	comedi_subdevice * s);
+				 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,sampl_t *dma,sampl_t *data,int n);
-void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device * dev,
+void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device *dev,
-	comedi_subdevice * s, sampl_t * dma_buffer, unsigned int num_samples);
+					   comedi_subdevice *s,
-int i_APCI3120_InterruptHandleEos(comedi_device * dev);
+					   sampl_t *dma_buffer,
+					   unsigned int num_samples);
+int i_APCI3120_InterruptHandleEos(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(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			       comedi_insn *insn, lsampl_t *data);
-int i_APCI3120_InsnWriteTimer(comedi_device * dev, comedi_subdevice * s,
+int i_APCI3120_InsnWriteTimer(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			      comedi_insn *insn, lsampl_t *data);
-int i_APCI3120_InsnReadTimer(comedi_device * dev, comedi_subdevice * s,
+int i_APCI3120_InsnReadTimer(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			     comedi_insn *insn, lsampl_t *data);
 //DI
 // for di read
-int i_APCI3120_InsnBitsDigitalInput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI3120_InsnBitsDigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				    comedi_insn *insn, lsampl_t *data);
-int i_APCI3120_InsnReadDigitalInput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI3120_InsnReadDigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				    comedi_insn *insn, lsampl_t *data);
 //DO
 //int i_APCI3120_WriteDigitalOutput(comedi_device *dev, BYTE data);
-int i_APCI3120_InsnConfigDigitalOutput(comedi_device * dev,
+int i_APCI3120_InsnConfigDigitalOutput(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+				       comedi_subdevice *s, comedi_insn *insn,
-int i_APCI3120_InsnBitsDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+				       lsampl_t *data);
-	comedi_insn * insn, lsampl_t * data);
+int i_APCI3120_InsnBitsDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-int i_APCI3120_InsnWriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+				     comedi_insn *insn, lsampl_t *data);
-	comedi_insn * insn, lsampl_t * data);
+int i_APCI3120_InsnWriteDigitalOutput(comedi_device *dev, comedi_subdevice *s,
+				      comedi_insn *insn, lsampl_t *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_InsnWriteAnalogOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				     comedi_insn *insn, lsampl_t *data);
 //AI HArdware layer
-int i_APCI3120_InsnConfigAnalogInput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI3120_InsnConfigAnalogInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				     comedi_insn *insn, lsampl_t *data);
-int i_APCI3120_InsnReadAnalogInput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI3120_InsnReadAnalogInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				   comedi_insn *insn, lsampl_t *data);
-int i_APCI3120_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI3120_CommandTestAnalogInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_cmd * cmd);
+				      comedi_cmd *cmd);
-int i_APCI3120_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s);
+int i_APCI3120_CommandAnalogInput(comedi_device *dev, comedi_subdevice *s);
-//int i_APCI3120_CancelAnalogInput(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_StopCyclicAcquisition(comedi_device *dev, comedi_subdevice *s);
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 // Card Specific information
 #define APCI3200_BOARD_VENDOR_ID                 0x15B8
@@ -161,31 +154,34 @@ typedef struct {
 //AI
-INT i_APCI3200_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI3200_ConfigAnalogInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				 comedi_insn *insn, lsampl_t *data);
-INT i_APCI3200_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI3200_ReadAnalogInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+			       comedi_insn *insn, lsampl_t *data);
-INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device * dev,
+INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+					   comedi_subdevice *s,
-INT i_APCI3200_InsnBits_AnalogInput_Test(comedi_device * dev,
+					   comedi_insn *insn, lsampl_t *data);
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+INT i_APCI3200_InsnBits_AnalogInput_Test(comedi_device *dev,
-INT i_APCI3200_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s);
+					 comedi_subdevice *s,
-INT i_APCI3200_InterruptHandleEos(comedi_device * dev);
+					 comedi_insn *insn, lsampl_t *data);
-INT i_APCI3200_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI3200_StopCyclicAcquisition(comedi_device *dev, comedi_subdevice *s);
-	comedi_cmd * cmd);
+INT i_APCI3200_InterruptHandleEos(comedi_device *dev);
-INT i_APCI3200_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s);
+INT i_APCI3200_CommandTestAnalogInput(comedi_device *dev, comedi_subdevice *s,
-INT i_APCI3200_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s,
+				      comedi_cmd *cmd);
-	comedi_insn * insn, lsampl_t * data);
+INT i_APCI3200_CommandAnalogInput(comedi_device *dev, comedi_subdevice *s);
+INT i_APCI3200_ReadDigitalInput(comedi_device *dev, comedi_subdevice *s,
+				comedi_insn *insn, lsampl_t *data);
 //Interrupt
 void v_APCI3200_Interrupt(int irq, void *d);
-int i_APCI3200_InterruptHandleEos(comedi_device * dev);
+int i_APCI3200_InterruptHandleEos(comedi_device *dev);
 //Reset functions
-INT i_APCI3200_Reset(comedi_device * dev);
+INT i_APCI3200_Reset(comedi_device *dev);
-int i_APCI3200_ReadCJCCalOffset(comedi_device * dev, lsampl_t * data);
+int i_APCI3200_ReadCJCCalOffset(comedi_device *dev, lsampl_t *data);
-int i_APCI3200_ReadCJCValue(comedi_device * dev, lsampl_t * data);
+int i_APCI3200_ReadCJCValue(comedi_device *dev, lsampl_t *data);
-int i_APCI3200_ReadCalibrationGainValue(comedi_device * dev, UINT * data);
+int i_APCI3200_ReadCalibrationGainValue(comedi_device *dev, UINT *data);
-int i_APCI3200_ReadCalibrationOffsetValue(comedi_device * dev, UINT * data);
+int i_APCI3200_ReadCalibrationOffsetValue(comedi_device *dev, UINT *data);
-int i_APCI3200_Read1AnalogInputChannel(comedi_device * dev,
+int i_APCI3200_Read1AnalogInputChannel(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+				       comedi_subdevice *s, comedi_insn *insn,
-int i_APCI3200_ReadCJCCalGain(comedi_device * dev, lsampl_t * data);
+				       lsampl_t *data);
+int i_APCI3200_ReadCJCCalGain(comedi_device *dev, lsampl_t *data);
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
+ *	D-77833 Ottersweier
+ *	Tel: +19(0)7223/9493-0
+ *	Fax: +49(0)7223/9493-92
+ *	http://www.addi-data-com
+ *	info@addi-data.com
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
-        ADDI-DATA GmbH
-        Dieselstrasse 3
-        D-77833 Ottersweier
-        Tel: +19(0)7223/9493-0
-        Fax: +49(0)7223/9493-92
-        http://www.addi-data-com
-        info@addi-data.com
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 // Card Specific information
 #define APCI3501_BOARD_VENDOR_ID                 0x15B8
 #define APCI3501_ADDRESS_RANGE                   255
@@ -61,36 +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(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				  comedi_insn *insn, lsampl_t *data);
-INT i_APCI3501_WriteAnalogOutput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI3501_WriteAnalogOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				 comedi_insn *insn, lsampl_t *data);
 //DI
 // for di read
 //INT i_APCI3501_ReadDigitalInput(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);
-INT i_APCI3501_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI3501_ReadDigitalInput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				comedi_insn *insn, lsampl_t *data);
 //DO
-int i_APCI3501_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+int i_APCI3501_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				   comedi_insn *insn, lsampl_t *data);
-INT i_APCI3501_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI3501_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				  comedi_insn *insn, lsampl_t *data);
-INT i_APCI3501_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+INT i_APCI3501_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s,
-	comedi_insn * insn, lsampl_t * data);
+				 comedi_insn *insn, lsampl_t *data);
 // TIMER
 // timer value is passed as u seconds
-INT i_APCI3501_ConfigTimerCounterWatchdog(comedi_device * dev,
+INT i_APCI3501_ConfigTimerCounterWatchdog(comedi_device *dev,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+					  comedi_subdevice *s,
-int i_APCI3501_StartStopWriteTimerCounterWatchdog(comedi_device * dev,
+					  comedi_insn *insn, lsampl_t *data);
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+int i_APCI3501_StartStopWriteTimerCounterWatchdog(comedi_device *dev,
-int i_APCI3501_ReadTimerCounterWatchdog(comedi_device * dev,
+						  comedi_subdevice *s,
-	comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+						  comedi_insn *insn,
+						  lsampl_t *data);
+int i_APCI3501_ReadTimerCounterWatchdog(comedi_device *dev,
+					comedi_subdevice *s,
+					comedi_insn *insn, lsampl_t *data);
 //Interrupt
 void v_APCI3501_Interrupt(int irq, void *d);
 //Reset functions
-int i_APCI3501_Reset(comedi_device * dev);
+int i_APCI3501_Reset(comedi_device *dev);
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
-/**
+/*
-@verbatim
+ * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *
-Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
+ *	ADDI-DATA GmbH
+ *	Dieselstrasse 3
-        ADDI-DATA GmbH
+ *	D-77833 Ottersweier
-        Dieselstrasse 3
+ *	Tel: +19(0)7223/9493-0
-        D-77833 Ottersweier
+ *	Fax: +49(0)7223/9493-92
-        Tel: +19(0)7223/9493-0
+ *	http://www.addi-data-com
-        Fax: +49(0)7223/9493-92
+ *	info@addi-data.com
-        http://www.addi-data-com
+ *
-        info@addi-data.com
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ */
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-You shoud also find the complete GPL in the COPYING file accompanying this source code.
-@endverbatim
-*/
 #ifndef COMEDI_SUBD_TTLIO
 #define COMEDI_SUBD_TTLIO   11	/* Digital Input Output But TTL */