openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: Comedi: change space indentation to tabs 

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bill Pemberton 2009-04-09 16:07:27 -04:00 committed by Greg Kroah-Hartman
parent 53106ae68a
commit 356cdbcb83
27 changed files with 314 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

20
drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.
@ -695,15 +695,15 @@ int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev,
| unsigned char_ b_ModulNbr CR_AREF(aref) : Selected module number (0 to 3)| | unsigned char_ b_ModulNbr CR_AREF(aref) : Selected module number (0 to 3)|
| unsigned char_ b_PortValue CR_CHAN(chanspec) : Output Value ( 0 To 7 ) | unsigned char_ b_PortValue CR_CHAN(chanspec) : Output Value ( 0 To 7 )
| data[0] read or write port | data[0] read or write port
data[1] if write then indicate ON or OFF | data[1] if write then indicate ON or OFF
if read : data[1] will return port status. | if read : data[1] will return port status.
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Return Value : | Return Value :
INPUT : | INPUT :
0: No error | 0: No error |
| -1: The handle parameter of the board is wrong | | -1: The handle parameter of the board is wrong |

14
drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

14
drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

14
drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

14
drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

14
drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

14
drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

14
drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

16
drivers/staging/comedi/drivers/addi-data/addi_common.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.
@ -2576,7 +2576,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
this_board->pc_DriverName); this_board->pc_DriverName);
if ((ret = alloc_private(dev, sizeof(struct addi_private))) < 0) { if ((ret = alloc_private(dev, sizeof(struct addi_private))) < 0) {
return -ENOMEM; return -ENOMEM;
} }
if (!pci_list_builded) { if (!pci_list_builded) {

14
drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

14
drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

106
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.
@ -69,37 +69,37 @@ int i_Flag = 1;
| | | |
| data[0] : 0 Configure As Timer | | data[0] : 0 Configure As Timer |
| 1 Configure As Watchdog | | 1 Configure As Watchdog |
data[1] : Watchdog number | data[1] : Watchdog number
| data[2] : Time base Unit | | data[2] : Time base Unit |
| data[3] : Reload Value | | data[3] : Reload Value |
data[4] : External Trigger | | data[4] : External Trigger |
1:Enable | 1:Enable
0:Disable | 0:Disable
data[5] :External Trigger Level | data[5] :External Trigger Level
00 Trigger Disabled | 00 Trigger Disabled
01 Trigger Enabled (Low level) | 01 Trigger Enabled (Low level)
10 Trigger Enabled (High Level) | 10 Trigger Enabled (High Level)
11 Trigger Enabled (High/Low level) | 11 Trigger Enabled (High/Low level)
data[6] : External Gate | | data[6] : External Gate |
1:Enable | 1:Enable
0:Disable | 0:Disable
data[7] : External Gate level | data[7] : External Gate level
00 Gate Disabled | 00 Gate Disabled
01 Gate Enabled (Low level) | 01 Gate Enabled (Low level)
10 Gate Enabled (High Level) | 10 Gate Enabled (High Level)
data[8] :Warning Relay | data[8] :Warning Relay
1: ENABLE | 1: ENABLE
0: DISABLE | 0: DISABLE
data[9] :Warning Delay available | data[9] :Warning Delay available
data[10] :Warning Relay Time unit | data[10] :Warning Relay Time unit
data[11] :Warning Relay Time Reload value | data[11] :Warning Relay Time Reload value
data[12] :Reset Relay | data[12] :Reset Relay
1 : ENABLE | 1 : ENABLE
0 : DISABLE | 0 : DISABLE
data[13] :Interrupt | data[13] :Interrupt
1 : ENABLE | 1 : ENABLE
0 : DISABLE | 0 : DISABLE
|
| |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -381,11 +381,11 @@ int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : data[0] : software trigger status | Output Parameters : data[0] : software trigger status
data[1] : hardware trigger status | data[1] : hardware trigger status
| data[2] : Software clear status | data[2] : Software clear status
data[3] : Overflow status | data[3] : Overflow status
data[4] : Timer actual value | data[4] : Timer actual value
|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Return Value : TRUE : No error occur | | Return Value : TRUE : No error occur |
@ -398,25 +398,29 @@ int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, struct comedi_subdevi
{ {
unsigned int ui_Status = 0; /* Status register */ unsigned int ui_Status = 0; /* Status register */
i_WatchdogNbr = insn->unused[0]; i_WatchdogNbr = insn->unused[0];
/******************/
/******************/
/* Get the status */ /* Get the status */
/******************/ /******************/
ui_Status = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 16); ui_Status = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 16);
/***********************************/
/***********************************/
/* Get the software trigger status */ /* Get the software trigger status */
/***********************************/ /***********************************/
data[0] = ((ui_Status >> 1) & 1); data[0] = ((ui_Status >> 1) & 1);
/***********************************/ /***********************************/
/* Get the hardware trigger status */ /* Get the hardware trigger status */
/***********************************/ /***********************************/
data[1] = ((ui_Status >> 2) & 1); data[1] = ((ui_Status >> 2) & 1);
/*********************************/ /*********************************/
/* Get the software clear status */ /* Get the software clear status */
/*********************************/ /*********************************/
data[2] = ((ui_Status >> 3) & 1); data[2] = ((ui_Status >> 3) & 1);
/***************************/ /***************************/
/* Get the overflow status */ /* Get the overflow status */
/***************************/ /***************************/
data[3] = ((ui_Status >> 0) & 1); data[3] = ((ui_Status >> 0) & 1);
if (devpriv->b_TimerSelectMode == ADDIDATA_TIMER) { if (devpriv->b_TimerSelectMode == ADDIDATA_TIMER) {
data[4] = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 0); data[4] = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 0);

14
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

114
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.
@ -77,7 +77,7 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled =
| data[0] :Number of the input port on | | data[0] :Number of the input port on |
| which the event will take place | | which the event will take place |
| (1 or 2) | (1 or 2)
data[1] : The event logic for port 1 has | | data[1] : The event logic for port 1 has |
| three possibilities | | three possibilities |
| :0 APCI1500_AND :This logic | | :0 APCI1500_AND :This logic |
| links | | links |
@ -508,9 +508,9 @@ int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| unsigned int ui_Channel : Channel number to read | | unsigned int ui_Channel : Channel number to read |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
data[0] :0 Start input event | data[0] :0 Start input event
1 Stop input event | 1 Stop input event
data[1] :No of port (1 or 2) | data[1] :No of port (1 or 2)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -945,9 +945,9 @@ int i_APCI1500_Initialisation(struct comedi_device *dev, struct comedi_subdevice
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| unsigned int ui_NoOfChannels : No Of Channels To be Read | | unsigned int ui_NoOfChannels : No Of Channels To be Read |
| unsigned int *data : Data Pointer | unsigned int *data : Data Pointer
data[0] : 0 Read a single channel | data[0] : 0 Read a single channel
1 read a port value | 1 read a port value
data[1] : port value | data[1] : port value
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- data[0] :The read status value | Output Parameters : -- data[0] :The read status value
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1015,21 +1015,21 @@ int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_ConfigDigitalOutputErrorInterrupt | Function Name : int i_APCI1500_ConfigDigitalOutputErrorInterrupt
(struct comedi_device *dev,struct comedi_subdevice *s struct comedi_insn | (struct comedi_device *dev,struct comedi_subdevice *s struct comedi_insn
*insn,unsigned int *data) | | *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures the digital output memory and the digital | Task : Configures the digital output memory and the digital
output error interrupt | | output error interrupt |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| unsigned int *data : Data Pointer contains | | unsigned int *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| data[0] :1:Memory on | | data[0] :1:Memory on |
| 0:Memory off | | 0:Memory off |
data[1] :1 Enable the voltage error interrupt | data[1] :1 Enable the voltage error interrupt
| :0 Disable the voltage error interrupt | | :0 Disable the voltage error interrupt |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1215,23 +1215,23 @@ int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device | Function Name : int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device
*dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)| | *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)|
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Watchdog | | Task : Configures The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status data[0] : 2 APCI1500_1_8_KHZ | unsigned int *data : Data Pointer to read status data[0] : 2 APCI1500_1_8_KHZ
| 1 APCI1500_3_6_KHZ | | 1 APCI1500_3_6_KHZ |
| 0 APCI1500_115_KHZ | 0 APCI1500_115_KHZ
data[1] : 0 Counter1/Timer1 | data[1] : 0 Counter1/Timer1
1 Counter2/Timer2 | 1 Counter2/Timer2
2 Counter3/Watchdog | 2 Counter3/Watchdog
data[2] : 0 Counter | data[2] : 0 Counter
1 Timer/Watchdog | 1 Timer/Watchdog
data[3] : This parameter has | | data[3] : This parameter has |
| two meanings. | | two meanings. |
| - If the counter/timer | | - If the counter/timer |
| is used as a counter | | is used as a counter |
@ -1243,15 +1243,15 @@ int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
| the divider factor | | the divider factor |
| for the output is | | for the output is |
| given. | given.
data[4] : 0 APCI1500_CONTINUOUS | data[4] : 0 APCI1500_CONTINUOUS
1 APCI1500_SINGLE | 1 APCI1500_SINGLE
data[5] : 0 Software Trigger | data[5] : 0 Software Trigger
1 Hardware Trigger | 1 Hardware Trigger
|
data[6] :0 Software gate | data[6] :0 Software gate
1 Hardware gate | 1 Hardware gate
data[7] :0 Interrupt Disable | data[7] :0 Interrupt Disable
1 Interrupt Enable | 1 Interrupt Enable
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1836,22 +1836,22 @@ int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_StartStopTriggerTimerCounterWatchdog | | Function Name : int i_APCI1500_StartStopTriggerTimerCounterWatchdog |
| (struct comedi_device *dev,struct comedi_subdevice *s, | (struct comedi_device *dev,struct comedi_subdevice *s,
struct comedi_insn *insn,unsigned int *data); | | struct comedi_insn *insn,unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Start / Stop or trigger the timer counter or Watchdog | | Task : Start / Stop or trigger the timer counter or Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
data[0] : 0 Counter1/Timer1 | data[0] : 0 Counter1/Timer1
1 Counter2/Timer2 | 1 Counter2/Timer2
2 Counter3/Watchdog | 2 Counter3/Watchdog
data[1] : 0 start | data[1] : 0 start
1 stop | 1 stop
2 Trigger | 2 Trigger
data[2] : 0 Counter | data[2] : 0 Counter
1 Timer/Watchdog | 1 Timer/Watchdog
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2161,18 +2161,18 @@ int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_ReadCounterTimerWatchdog | | Function Name : int i_APCI1500_ReadCounterTimerWatchdog |
| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, | (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
unsigned int *data); | | unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read The Watchdog | | Task : Read The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
data[0] : 0 Counter1/Timer1 | data[0] : 0 Counter1/Timer1
1 Counter2/Timer2 | 1 Counter2/Timer2
2 Counter3/Watchdog | 2 Counter3/Watchdog
|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2352,13 +2352,13 @@ int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_ReadInterruptMask | | Function Name : int i_APCI1500_ReadInterruptMask |
| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, | (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
unsigned int *data); | | unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read the interrupt mask | | Task : Read the interrupt mask |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
@ -2383,15 +2383,15 @@ int i_APCI1500_ReadInterruptMask(struct comedi_device *dev, struct comedi_subdev
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_ConfigureInterrupt | | Function Name : int i_APCI1500_ConfigureInterrupt |
| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, | (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
unsigned int *data); | | unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures the interrupt registers | | Task : Configures the interrupt registers |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer | | unsigned int *data : Data Pointer |
|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | Output Parameters : --

34
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.
@ -63,7 +63,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -103,7 +103,7 @@ int i_APCI1516_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdev
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -149,7 +149,7 @@ int i_APCI1516_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_ConfigDigitalOutput (struct comedi_device *dev, | Function Name : int i_APCI1516_ConfigDigitalOutput (struct comedi_device *dev,
struct comedi_subdevice *s struct comedi_insn *insn,unsigned int *data) | | struct comedi_subdevice *s struct comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Digital Output Subdevice. | | Task : Configures The Digital Output Subdevice. |
@ -158,7 +158,7 @@ int i_APCI1516_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
| unsigned int *data : Data Pointer contains | | unsigned int *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| data[0] :1:Memory on | | data[0] :1:Memory on |
| 0:Memory off | | 0:Memory off |
| | | |
@ -182,13 +182,13 @@ int i_APCI1516_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subd
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_WriteDigitalOutput | | Function Name : int i_APCI1516_WriteDigitalOutput |
| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, | (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
unsigned int *data) | | unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Writes port value To the selected port | | Task : Writes port value To the selected port |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -342,13 +342,13 @@ int i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_ReadDigitalOutput | | Function Name : int i_APCI1516_ReadDigitalOutput |
| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, | (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
unsigned int *data) | | unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read value of the selected channel or port | | Task : Read value of the selected channel or port |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -401,14 +401,14 @@ int i_APCI1516_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, | Function Name : int i_APCI1516_ConfigWatchdog(struct comedi_device *dev,
struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | | struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Watchdog | | Task : Configures The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |

14
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

14
drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

14
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

22
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.
@ -363,14 +363,14 @@ int i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_ConfigWatchdog(comedi_device | Function Name : int i_APCI2032_ConfigWatchdog(comedi_device
*dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)| | *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)|
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Watchdog | | Task : Configures The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -449,13 +449,13 @@ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_s
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_ReadWatchdog | | Function Name : int i_APCI2032_ReadWatchdog |
| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, | (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
unsigned int *data); | | unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read The Watchdog | | Task : Read The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |

38
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.
@ -63,7 +63,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -101,7 +101,7 @@ int i_APCI2200_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdev
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -147,7 +147,7 @@ int i_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_ConfigDigitalOutput (struct comedi_device *dev, | Function Name : int i_APCI2200_ConfigDigitalOutput (struct comedi_device *dev,
struct comedi_subdevice *s struct comedi_insn *insn,unsigned int *data) | | struct comedi_subdevice *s struct comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Digital Output Subdevice. | | Task : Configures The Digital Output Subdevice. |
@ -156,7 +156,7 @@ int i_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
| unsigned int *data : Data Pointer contains | | unsigned int *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| data[0] :1:Memory on | | data[0] :1:Memory on |
| 0:Memory off | | 0:Memory off |
| | | |
@ -180,13 +180,13 @@ int i_APCI2200_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subd
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_WriteDigitalOutput | | Function Name : int i_APCI2200_WriteDigitalOutput |
| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, | (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
unsigned int *data) | | unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Writes port value To the selected port | | Task : Writes port value To the selected port |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -337,13 +337,13 @@ int i_APCI2200_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_ReadDigitalOutput | | Function Name : int i_APCI2200_ReadDigitalOutput |
| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, | (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
unsigned int *data) | | unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read value of the selected channel or port | | Task : Read value of the selected channel or port |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -400,14 +400,14 @@ int i_APCI2200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, | Function Name : int i_APCI2200_ConfigWatchdog(struct comedi_device *dev,
struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | | struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Watchdog | | Task : Configures The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -492,13 +492,13 @@ int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_s
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_ReadWatchdog | | Function Name : int i_APCI2200_ReadWatchdog |
| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, | (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,
unsigned int *data); | | unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read The Watchdog | | Task : Read The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| struct comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
struct comedi_insn *insn :pointer to insn structure | | struct comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |

26
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.
@ -804,9 +804,9 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
us_TmpValue = (unsigned short) inw(dev->iobase + APCI3120_RD_STATUS); us_TmpValue = (unsigned short) inw(dev->iobase + APCI3120_RD_STATUS);
/*** EL241003 : add this section in comment because floats must not be used /*** EL241003 : add this section in comment because floats must not be used
if((us_TmpValue & 0x00B0)==0x00B0) if((us_TmpValue & 0x00B0)==0x00B0)
{ {
f_ConvertValue=(((float)ui_ConvertTiming * 0.002) - 2); f_ConvertValue=(((float)ui_ConvertTiming * 0.002) - 2);
ui_TimerValue0=(unsigned int)f_ConvertValue; ui_TimerValue0=(unsigned int)f_ConvertValue;
if (mode==2) if (mode==2)
{ {
@ -814,7 +814,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
ui_TimerValue1 = (unsigned int) f_DelayValue; ui_TimerValue1 = (unsigned int) f_DelayValue;
} }
} }
else else
{ {
f_ConvertValue=(((float)ui_ConvertTiming * 0.0012926) - 1); f_ConvertValue=(((float)ui_ConvertTiming * 0.0012926) - 1);
ui_TimerValue0=(unsigned int)f_ConvertValue; ui_TimerValue0=(unsigned int)f_ConvertValue;
@ -2463,9 +2463,9 @@ int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev,
| struct comedi_subdevice *s | | struct comedi_subdevice *s |
| struct comedi_insn *insn | | struct comedi_insn *insn |
| unsigned int *data | | unsigned int *data |
data[0] Value to be written | data[0] Value to be written
data[1] :1 Set digital o/p ON | data[1] :1 Set digital o/p ON
data[1] 2 Set digital o/p OFF with memory ON | data[1] 2 Set digital o/p OFF with memory ON
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Return Value : | | Return Value : |
| | | |

14
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

14
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

14
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
View File

@ -3,13 +3,13 @@
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 ADDI-DATA GmbH
Dieselstrasse 3 Dieselstrasse 3
D-77833 Ottersweier D-77833 Ottersweier
Tel: +19(0)7223/9493-0 Tel: +19(0)7223/9493-0
Fax: +49(0)7223/9493-92 Fax: +49(0)7223/9493-92
http://www.addi-data-com http://www.addi-data-com
info@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 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.

8
drivers/staging/comedi/drivers/serial2002.c
View File

@ -121,12 +121,12 @@ struct serial_data {
static long tty_ioctl(struct file *f, unsigned op, unsigned long param) static long tty_ioctl(struct file *f, unsigned op, unsigned long param)
{ {
#ifdef HAVE_UNLOCKED_IOCTL #ifdef HAVE_UNLOCKED_IOCTL
if (f->f_op->unlocked_ioctl) { if (f->f_op->unlocked_ioctl) {
return f->f_op->unlocked_ioctl(f, op, param); return f->f_op->unlocked_ioctl(f, op, param);
} }
#endif #endif
if (f->f_op->ioctl) { if (f->f_op->ioctl) {
return f->f_op->ioctl(f->f_dentry->d_inode, f, op, param); return f->f_op->ioctl(f->f_dentry->d_inode, f, op, param);
} }
return -ENOSYS; return -ENOSYS;
} }
@ -211,7 +211,7 @@ static int tty_read(struct file *f, int timeout)
/* Device does not support poll, busy wait */ /* Device does not support poll, busy wait */
int retries = 0; int retries = 0;
while (1) { while (1) {
unsigned char ch; unsigned char ch;
retries++; retries++;
if (retries >= timeout) { if (retries >= timeout) {
@ -220,7 +220,7 @@ static int tty_read(struct file *f, int timeout)
f->f_pos = 0; f->f_pos = 0;
if (f->f_op->read(f, &ch, 1, &f->f_pos) == 1) { if (f->f_op->read(f, &ch, 1, &f->f_pos) == 1) {
result = ch; result = ch;
break; break;
} }
comedi_udelay(100); comedi_udelay(100);

2
drivers/staging/comedi/range.c
View File

@ -32,7 +32,7 @@ const struct comedi_lrange range_unipolar5 = { 1, {UNI_RANGE(5)} };
const struct comedi_lrange range_unknown = { 1, {{0, 1000000, UNIT_none}} }; const struct comedi_lrange range_unknown = { 1, {{0, 1000000, UNIT_none}} };
/* /*
COMEDI_RANGEINFO COMEDI_RANGEINFO
range information ioctl range information ioctl
arg: arg: