Skip to content

Commit

Permalink
Staging: comedi: addi-data header file cleanups
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Greg Kroah-Hartman committed Apr 3, 2009
1 parent 851a2c1 commit 15d8826
Show file tree
Hide file tree
Showing 27 changed files with 1,650 additions and 1,856 deletions.
129 changes: 59 additions & 70 deletions drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
View file
Original file line number Diff line number Diff line change
@@ -1,84 +1,73 @@
/**
@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 APCI1710_PCI_BUS_CLOCK 0
#define APCI1710_FRONT_CONNECTOR_INPUT 1
#define APCI1710_TIMER_READVALUE 0
#define APCI1710_TIMER_GETOUTPUTLEVEL 1
#define APCI1710_TIMER_GETPROGRESSSTATUS 2
#define APCI1710_TIMER_WRITEVALUE 3

#define APCI1710_TIMER_READINTERRUPT 1
#define APCI1710_TIMER_READALLTIMER 2

// BEGIN JK 27.10.03 : Add the possibility to use a 40 Mhz quartz
/*
* 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.
*/

#define APCI1710_PCI_BUS_CLOCK 0
#define APCI1710_FRONT_CONNECTOR_INPUT 1
#define APCI1710_TIMER_READVALUE 0
#define APCI1710_TIMER_GETOUTPUTLEVEL 1
#define APCI1710_TIMER_GETPROGRESSSTATUS 2
#define APCI1710_TIMER_WRITEVALUE 3

#define APCI1710_TIMER_READINTERRUPT 1
#define APCI1710_TIMER_READALLTIMER 2

/* BEGIN JK 27.10.03 : Add the possibility to use a 40 Mhz quartz */
#ifndef APCI1710_10MHZ
#define APCI1710_10MHZ 10
#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,
comedi_insn * insn, lsampl_t * data);
INT i_APCI1710_InsnWriteEnableDisableTimer(comedi_device *dev,
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 |
+----------------------------------------------------------------------------+
*/

INT i_APCI1710_InsnReadAllTimerValue(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data);
* 82X54 READ FUNCTION
*/
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,
comedi_insn * insn, lsampl_t * data);
INT i_APCI1710_InsnBitsTimer(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data);

/*
+----------------------------------------------------------------------------+
| 82X54 READ & WRITE FUNCTION |
+----------------------------------------------------------------------------+
*/
INT i_APCI1710_ReadTimerValue(comedi_device * dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, PULONG pul_TimerValue);
* 82X54 READ & WRITE FUNCTION
*/
INT i_APCI1710_ReadTimerValue(comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr,
PULONG pul_TimerValue);

INT i_APCI1710_GetTimerOutputLevel(comedi_device * dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, PBYTE pb_OutputLevel);
INT i_APCI1710_GetTimerOutputLevel(comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr,
PBYTE pb_OutputLevel);

INT i_APCI1710_GetTimerProgressStatus(comedi_device * dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, PBYTE pb_TimerStatus);
INT i_APCI1710_GetTimerProgressStatus(comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr,
PBYTE pb_TimerStatus);

/*
+----------------------------------------------------------------------------+
| 82X54 WRITE FUNCTION |
+----------------------------------------------------------------------------+
*/
INT i_APCI1710_WriteTimerValue(comedi_device * dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, ULONG ul_WriteValue);
* 82X54 WRITE FUNCTION
*/
INT i_APCI1710_WriteTimerValue(comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr,
ULONG ul_WriteValue);
135 changes: 62 additions & 73 deletions drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
View file
Original file line number Diff line number Diff line change
@@ -1,85 +1,74 @@
/**
@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.
*
* 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.
*/

#define APCI1710_30MHZ 30
#define APCI1710_33MHZ 33
#define APCI1710_40MHZ 40
#define APCI1710_30MHZ 30
#define APCI1710_33MHZ 33
#define APCI1710_40MHZ 40

#define APCI1710_SINGLE 0
#define APCI1710_CONTINUOUS 1
#define APCI1710_SINGLE 0
#define APCI1710_CONTINUOUS 1

#define APCI1710_CHRONO_PROGRESS_STATUS 0
#define APCI1710_CHRONO_READVALUE 1
#define APCI1710_CHRONO_CONVERTVALUE 2
#define APCI1710_CHRONO_READINTERRUPT 3
#define APCI1710_CHRONO_PROGRESS_STATUS 0
#define APCI1710_CHRONO_READVALUE 1
#define APCI1710_CHRONO_CONVERTVALUE 2
#define APCI1710_CHRONO_READINTERRUPT 3

#define APCI1710_CHRONO_SET_CHANNELON 0
#define APCI1710_CHRONO_SET_CHANNELOFF 1
#define APCI1710_CHRONO_READ_CHANNEL 2
#define APCI1710_CHRONO_READ_PORT 3
#define APCI1710_CHRONO_SET_CHANNELON 0
#define APCI1710_CHRONO_SET_CHANNELOFF 1
#define APCI1710_CHRONO_READ_CHANNEL 2
#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,
comedi_insn * insn, lsampl_t * data);

INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
lsampl_t *data);

/*
+----------------------------------------------------------------------------+
| CHRONOMETER READ FUNCTION |
+----------------------------------------------------------------------------+
*/

INT i_APCI1710_InsnReadChrono(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data);

INT i_APCI1710_GetChronoProgressStatus(comedi_device * dev,
BYTE b_ModulNbr, PBYTE pb_ChronoStatus);

INT i_APCI1710_ReadChronoValue(comedi_device * dev,
BYTE b_ModulNbr,
UINT ui_TimeOut, PBYTE pb_ChronoStatus, PULONG pul_ChronoValue);

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);
* CHRONOMETER READ FUNCTION
*/
INT i_APCI1710_InsnReadChrono(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data);

INT i_APCI1710_GetChronoProgressStatus(comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_ChronoStatus);

INT i_APCI1710_ReadChronoValue(comedi_device *dev,
BYTE b_ModulNbr,
UINT ui_TimeOut, PBYTE pb_ChronoStatus,
PULONG pul_ChronoValue);

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);

/*
+----------------------------------------------------------------------------+
| CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION |
+----------------------------------------------------------------------------+
*/

INT i_APCI1710_InsnBitsChronoDigitalIO(comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
* CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION
*/
INT i_APCI1710_InsnBitsChronoDigitalIO(comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn,
lsampl_t *data);
93 changes: 42 additions & 51 deletions drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,46 @@
/**
@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 APCI1710_ON 1 // Digital Output ON or OFF
#define APCI1710_OFF 0

#define APCI1710_INPUT 0 // Digital I/O
#define APCI1710_OUTPUT 1

#define APCI1710_DIGIO_MEMORYONOFF 0x10 //
#define APCI1710_DIGIO_INIT 0x11

/*
+----------------------------------------------------------------------------+
| DIGITAL I/O INISIALISATION FUNCTION |
+----------------------------------------------------------------------------+
*/

INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, lsampl_t * data);
* 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.
*/

#define APCI1710_ON 1 /* Digital Output ON or OFF */
#define APCI1710_OFF 0

#define APCI1710_INPUT 0 /* Digital I/O */
#define APCI1710_OUTPUT 1

#define APCI1710_DIGIO_MEMORYONOFF 0x10
#define APCI1710_DIGIO_INIT 0x11

/*
+----------------------------------------------------------------------------+
| INPUT OUTPUT FUNCTIONS |
+----------------------------------------------------------------------------+
*/
INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);

INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
* DIGITAL I/O INISIALISATION FUNCTION
*/
INT i_APCI1710_InsnConfigDigitalIO(comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data);

INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
/*
* INPUT OUTPUT FUNCTIONS
*/
INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data);

INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data);

INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn, lsampl_t *data);
Loading

0 comments on commit 15d8826

Please sign in to comment.