evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: comedi: Remove BYTE and *PBYTE typedefs in addi-data

Browse source 
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-03-25 11:04:41 -04:00 • committed by Greg Kroah-Hartman
parent 2ec9f875f8
commit 1783fbfe02
24 changed files with 1280 additions and 1281 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

216
drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
View file

@ -23,15 +23,15 @@
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_InitTimer | | Function Name : _INT_ i_APCI1710_InitTimer |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_TimerNbr, | | unsigned char_ b_TimerNbr, |
| BYTE_ b_TimerMode, | | unsigned char_ b_TimerMode, |
| ULONG_ ul_ReloadValue, | | ULONG_ ul_ReloadValue, |
| BYTE_ b_InputClockSelection, | | unsigned char_ b_InputClockSelection, |
| BYTE_ b_InputClockLevel, | | unsigned char_ b_InputClockLevel, |
| BYTE_ b_OutputLevel, | | unsigned char_ b_OutputLevel, |
| BYTE_ b_HardwareGateLevel) | unsigned char_ b_HardwareGateLevel)
INT i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s, INT i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s,
struct comedi_insn *insn,unsigned int *data) struct comedi_insn *insn,unsigned int *data)
| |
@ -148,13 +148,13 @@ INT i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s,
| +--------------------------------+------------------------------------+ | | +--------------------------------+------------------------------------+ |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board |
| APCI-1710 | | APCI-1710 |
| BYTE_ b_ModulNbr : Module number to | | unsigned char_ b_ModulNbr : Module number to |
| configure (0 to 3) | | configure (0 to 3) |
| BYTE_ b_TimerNbr : Timer number to | | unsigned char_ b_TimerNbr : Timer number to |
| configure (0 to 2) | | configure (0 to 2) |
| BYTE_ b_TimerMode : Timer mode selection | | unsigned char_ b_TimerMode : Timer mode selection |
| (0 to 5) | | (0 to 5) |
| 0: Interrupt on terminal| | 0: Interrupt on terminal|
| count | | count |
@ -173,21 +173,21 @@ INT i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s,
| or division factor | | or division factor |
| See timer mode | | See timer mode |
| description table. | | description table. |
| BYTE_ b_InputClockSelection : Selection from input | | unsigned char_ b_InputClockSelection : Selection from input |
| timer clock. | | timer clock. |
| See input clock | | See input clock |
| selection table. | | selection table. |
| BYTE_ b_InputClockLevel : Selection from input | | unsigned char_ b_InputClockLevel : Selection from input |
| clock level. | | clock level. |
| 0 : Low active | | 0 : Low active |
| (Input inverted) | | (Input inverted) |
| 1 : High active | | 1 : High active |
| BYTE_ b_OutputLevel, : Selection from output | | unsigned char_ b_OutputLevel, : Selection from output |
| clock level. | | clock level. |
| 0 : Low active | | 0 : Low active |
| 1 : High active | | 1 : High active |
| (Output inverted) | | (Output inverted) |
| BYTE_ b_HardwareGateLevel : Selection from | | unsigned char_ b_HardwareGateLevel : Selection from |
| hardware gate level. | | hardware gate level. |
| 0 : Low active | | 0 : Low active |
| (Input inverted) | | (Input inverted) |
@ -195,14 +195,14 @@ INT i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s,
| If you will not used | | If you will not used |
| the hardware gate set | | the hardware gate set |
| this value to 0. | this value to 0.
|b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); |b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_TimerNbr = (BYTE) CR_CHAN(insn->chanspec); b_TimerNbr = (unsigned char) CR_CHAN(insn->chanspec);
b_TimerMode = (BYTE) data[0]; b_TimerMode = (unsigned char) data[0];
ul_ReloadValue = (ULONG) data[1]; ul_ReloadValue = (ULONG) data[1];
b_InputClockSelection =(BYTE) data[2]; b_InputClockSelection =(unsigned char) data[2];
b_InputClockLevel =(BYTE) data[3]; b_InputClockLevel =(unsigned char) data[3];
b_OutputLevel =(BYTE) data[4]; b_OutputLevel =(unsigned char) data[4];
b_HardwareGateLevel =(BYTE) data[5]; b_HardwareGateLevel =(unsigned char) data[5];
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -224,28 +224,28 @@ INT i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_sub
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_TimerNbr; unsigned char b_TimerNbr;
BYTE b_TimerMode; unsigned char b_TimerMode;
ULONG ul_ReloadValue; ULONG ul_ReloadValue;
BYTE b_InputClockSelection; unsigned char b_InputClockSelection;
BYTE b_InputClockLevel; unsigned char b_InputClockLevel;
BYTE b_OutputLevel; unsigned char b_OutputLevel;
BYTE b_HardwareGateLevel; unsigned char b_HardwareGateLevel;
//BEGIN JK 27.10.2003 : Add the possibility to use a 40 Mhz quartz //BEGIN JK 27.10.2003 : Add the possibility to use a 40 Mhz quartz
DWORD dw_Test = 0; DWORD dw_Test = 0;
//END JK 27.10.2003 : Add the possibility to use a 40 Mhz quartz //END JK 27.10.2003 : Add the possibility to use a 40 Mhz quartz
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_TimerNbr = (BYTE) CR_CHAN(insn->chanspec); b_TimerNbr = (unsigned char) CR_CHAN(insn->chanspec);
b_TimerMode = (BYTE) data[0]; b_TimerMode = (unsigned char) data[0];
ul_ReloadValue = (ULONG) data[1]; ul_ReloadValue = (ULONG) data[1];
b_InputClockSelection = (BYTE) data[2]; b_InputClockSelection = (unsigned char) data[2];
b_InputClockLevel = (BYTE) data[3]; b_InputClockLevel = (unsigned char) data[3];
b_OutputLevel = (BYTE) data[4]; b_OutputLevel = (unsigned char) data[4];
b_HardwareGateLevel = (BYTE) data[5]; b_HardwareGateLevel = (unsigned char) data[5];
/* Test the module number */ /* Test the module number */
if (b_ModulNbr < 4) { if (b_ModulNbr < 4) {
@ -402,10 +402,10 @@ INT i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_sub
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_EnableTimer | | Function Name : _INT_ i_APCI1710_EnableTimer |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_TimerNbr, | | unsigned char_ b_TimerNbr, |
| BYTE_ b_InterruptEnable) | unsigned char_ b_InterruptEnable)
INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,struct comedi_subdevice *s, INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,struct comedi_subdevice *s,
struct comedi_insn *insn,unsigned int *data) | struct comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -416,22 +416,22 @@ INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,struct come
| generate a interrupt after the timer value reach | | generate a interrupt after the timer value reach |
| the zero. See function "i_APCI1710_SetBoardIntRoutineX"| | the zero. See function "i_APCI1710_SetBoardIntRoutineX"|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board |
| APCI-1710 | | APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number | | unsigned char_ b_ModulNbr : Selected module number |
| (0 to 3) | | (0 to 3) |
| BYTE_ b_TimerNbr : Timer number to enable | | unsigned char_ b_TimerNbr : Timer number to enable |
| (0 to 2) | | (0 to 2) |
| BYTE_ b_InterruptEnable : Enable or disable the | | unsigned char_ b_InterruptEnable : Enable or disable the |
| timer interrupt. | | timer interrupt. |
| APCI1710_ENABLE : | | APCI1710_ENABLE : |
| Enable the timer interrupt | | Enable the timer interrupt |
| APCI1710_DISABLE : | | APCI1710_DISABLE : |
| Disable the timer interrupt| | Disable the timer interrupt|
i_ReturnValue=insn->n; i_ReturnValue=insn->n;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_TimerNbr = (BYTE) CR_CHAN(insn->chanspec); b_TimerNbr = (unsigned char) CR_CHAN(insn->chanspec);
b_ActionType = (BYTE) data[0]; // enable disable b_ActionType = (unsigned char) data[0]; // enable disable
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -454,15 +454,15 @@ INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev,
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_DummyRead; DWORD dw_DummyRead;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_TimerNbr; unsigned char b_TimerNbr;
BYTE b_ActionType; unsigned char b_ActionType;
BYTE b_InterruptEnable; unsigned char b_InterruptEnable;
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_TimerNbr = (BYTE) CR_CHAN(insn->chanspec); b_TimerNbr = (unsigned char) CR_CHAN(insn->chanspec);
b_ActionType = (BYTE) data[0]; // enable disable b_ActionType = (unsigned char) data[0]; // enable disable
/* Test the module number */ /* Test the module number */
if (b_ModulNbr < 4) { if (b_ModulNbr < 4) {
@ -475,7 +475,7 @@ INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev,
switch (b_ActionType) { switch (b_ActionType) {
case APCI1710_ENABLE: case APCI1710_ENABLE:
b_InterruptEnable = (BYTE) data[1]; b_InterruptEnable = (unsigned char) data[1];
/* Test the interrupt selection */ /* Test the interrupt selection */
if ((b_InterruptEnable == APCI1710_ENABLE) || if ((b_InterruptEnable == APCI1710_ENABLE) ||
(b_InterruptEnable == APCI1710_DISABLE)) { (b_InterruptEnable == APCI1710_DISABLE)) {
@ -558,8 +558,8 @@ INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_ReadAllTimerValue | | Function Name : _INT_ i_APCI1710_ReadAllTimerValue |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| PULONG_ pul_TimerValueArray) | PULONG_ pul_TimerValueArray)
INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,struct comedi_subdevice *s, INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,struct comedi_subdevice *s,
struct comedi_insn *insn,unsigned int *data) | struct comedi_insn *insn,unsigned int *data) |
@ -567,9 +567,9 @@ INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,struct comedi_sub
| Task : Return the all timer values from selected timer | | Task : Return the all timer values from selected timer |
| module (b_ModulNbr). | | module (b_ModulNbr). |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board |
| APCI-1710 | | APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number | | unsigned char_ b_ModulNbr : Selected module number |
| (0 to 3) | | (0 to 3) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PULONG_ pul_TimerValueArray : Timer value array. | | Output Parameters : PULONG_ pul_TimerValueArray : Timer value array. |
@ -594,7 +594,7 @@ INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_su
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
BYTE b_ModulNbr, b_ReadType; unsigned char b_ModulNbr, b_ReadType;
PULONG pul_TimerValueArray; PULONG pul_TimerValueArray;
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
@ -684,7 +684,7 @@ struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)
INT i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice * s, INT i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_insn * insn, unsigned int * data) struct comedi_insn * insn, unsigned int * data)
{ {
BYTE b_BitsType; unsigned char b_BitsType;
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
b_BitsType = data[0]; b_BitsType = data[0];
@ -693,29 +693,29 @@ INT i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice
switch (b_BitsType) { switch (b_BitsType) {
case APCI1710_TIMER_READVALUE: case APCI1710_TIMER_READVALUE:
i_ReturnValue = i_APCI1710_ReadTimerValue(dev, i_ReturnValue = i_APCI1710_ReadTimerValue(dev,
(BYTE)CR_AREF(insn->chanspec), (unsigned char)CR_AREF(insn->chanspec),
(BYTE)CR_CHAN(insn->chanspec), (unsigned char)CR_CHAN(insn->chanspec),
(PULONG) & data[0]); (PULONG) & data[0]);
break; break;
case APCI1710_TIMER_GETOUTPUTLEVEL: case APCI1710_TIMER_GETOUTPUTLEVEL:
i_ReturnValue = i_APCI1710_GetTimerOutputLevel(dev, i_ReturnValue = i_APCI1710_GetTimerOutputLevel(dev,
(BYTE)CR_AREF(insn->chanspec), (unsigned char)CR_AREF(insn->chanspec),
(BYTE)CR_CHAN(insn->chanspec), (unsigned char)CR_CHAN(insn->chanspec),
(PBYTE) &data[0]); (unsigned char *) &data[0]);
break; break;
case APCI1710_TIMER_GETPROGRESSSTATUS: case APCI1710_TIMER_GETPROGRESSSTATUS:
i_ReturnValue = i_APCI1710_GetTimerProgressStatus(dev, i_ReturnValue = i_APCI1710_GetTimerProgressStatus(dev,
(BYTE)CR_AREF(insn->chanspec), (unsigned char)CR_AREF(insn->chanspec),
(BYTE)CR_CHAN(insn->chanspec), (unsigned char)CR_CHAN(insn->chanspec),
(PBYTE)&data[0]); (unsigned char *)&data[0]);
break; break;
case APCI1710_TIMER_WRITEVALUE: case APCI1710_TIMER_WRITEVALUE:
i_ReturnValue = i_APCI1710_WriteTimerValue(dev, i_ReturnValue = i_APCI1710_WriteTimerValue(dev,
(BYTE)CR_AREF(insn->chanspec), (unsigned char)CR_AREF(insn->chanspec),
(BYTE)CR_CHAN(insn->chanspec), (unsigned char)CR_CHAN(insn->chanspec),
(ULONG)data[1]); (ULONG)data[1]);
break; break;
@ -733,19 +733,19 @@ INT i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_ReadTimerValue | | Function Name : _INT_ i_APCI1710_ReadTimerValue |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_TimerNbr, | | unsigned char_ b_TimerNbr, |
| PULONG_ pul_TimerValue) | | PULONG_ pul_TimerValue) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Return the timer value from selected digital timer | | Task : Return the timer value from selected digital timer |
| (b_TimerNbr) from selected timer module (b_ModulNbr). | | (b_TimerNbr) from selected timer module (b_ModulNbr). |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board |
| APCI-1710 | | APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number | | unsigned char_ b_ModulNbr : Selected module number |
| (0 to 3) | | (0 to 3) |
| BYTE_ b_TimerNbr : Timer number to read | | unsigned char_ b_TimerNbr : Timer number to read |
| (0 to 2) | | (0 to 2) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PULONG_ pul_TimerValue : Timer value | | Output Parameters : PULONG_ pul_TimerValue : Timer value |
@ -761,7 +761,7 @@ INT i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice
*/ */
INT i_APCI1710_ReadTimerValue(struct comedi_device * dev, INT i_APCI1710_ReadTimerValue(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, unsigned char b_ModulNbr, unsigned char b_TimerNbr,
PULONG pul_TimerValue) PULONG pul_TimerValue)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -818,23 +818,23 @@ INT i_APCI1710_ReadTimerValue(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_GetTimerOutputLevel | | Function Name : _INT_ i_APCI1710_GetTimerOutputLevel |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_TimerNbr, | | unsigned char_ b_TimerNbr, |
| PBYTE_ pb_OutputLevel) | | unsigned char *_ pb_OutputLevel) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Return the output signal level (pb_OutputLevel) from | | Task : Return the output signal level (pb_OutputLevel) from |
| selected digital timer (b_TimerNbr) from selected timer| | selected digital timer (b_TimerNbr) from selected timer|
| module (b_ModulNbr). | | module (b_ModulNbr). |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board |
| APCI-1710 | | APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number | | unsigned char_ b_ModulNbr : Selected module number |
| (0 to 3) | | (0 to 3) |
| BYTE_ b_TimerNbr : Timer number to test | | unsigned char_ b_TimerNbr : Timer number to test |
| (0 to 2) | | (0 to 2) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PBYTE_ pb_OutputLevel : Output signal level | | Output Parameters : unsigned char *_ pb_OutputLevel : Output signal level |
| 0 : The output is low | | 0 : The output is low |
| 1 : The output is high | | 1 : The output is high |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -849,8 +849,8 @@ INT i_APCI1710_ReadTimerValue(struct comedi_device * dev,
*/ */
INT i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev, INT i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, unsigned char b_ModulNbr, unsigned char b_TimerNbr,
PBYTE pb_OutputLevel) unsigned char * pb_OutputLevel)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_TimerStatus; DWORD dw_TimerStatus;
@ -869,7 +869,7 @@ INT i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev,
/* Read the timer status */ /* Read the timer status */
dw_TimerStatus = inl(devpriv->s_BoardInfos.ui_Address + 16 + (b_TimerNbr * 4) + (64 * b_ModulNbr)); dw_TimerStatus = inl(devpriv->s_BoardInfos.ui_Address + 16 + (b_TimerNbr * 4) + (64 * b_ModulNbr));
*pb_OutputLevel = (BYTE) (((dw_TimerStatus >> 7) & 1) ^ devpriv-> s_ModuleInfo[b_ModulNbr].s_82X54ModuleInfo.s_82X54TimerInfo[b_TimerNbr].b_OutputLevel); *pb_OutputLevel = (unsigned char) (((dw_TimerStatus >> 7) & 1) ^ devpriv-> s_ModuleInfo[b_ModulNbr].s_82X54ModuleInfo.s_82X54TimerInfo[b_TimerNbr].b_OutputLevel);
} else { } else {
/* Timer not initialised see function */ /* Timer not initialised see function */
DPRINTK("Timer not initialised see function\n"); DPRINTK("Timer not initialised see function\n");
@ -897,23 +897,23 @@ INT i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_GetTimerProgressStatus | | Function Name : _INT_ i_APCI1710_GetTimerProgressStatus |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_TimerNbr, | | unsigned char_ b_TimerNbr, |
| PBYTE_ pb_TimerStatus) | | unsigned char *_ pb_TimerStatus) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Return the progress status (pb_TimerStatus) from | | Task : Return the progress status (pb_TimerStatus) from |
| selected digital timer (b_TimerNbr) from selected timer| | selected digital timer (b_TimerNbr) from selected timer|
| module (b_ModulNbr). | | module (b_ModulNbr). |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board |
| APCI-1710 | | APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number | | unsigned char_ b_ModulNbr : Selected module number |
| (0 to 3) | | (0 to 3) |
| BYTE_ b_TimerNbr : Timer number to test | | unsigned char_ b_TimerNbr : Timer number to test |
| (0 to 2) | | (0 to 2) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PBYTE_ pb_TimerStatus : Output signal level | | Output Parameters : unsigned char *_ pb_TimerStatus : Output signal level |
| 0 : Timer not in progress | | 0 : Timer not in progress |
| 1 : Timer in progress | | 1 : Timer in progress |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -928,8 +928,8 @@ INT i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev,
*/ */
INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, unsigned char b_ModulNbr, unsigned char b_TimerNbr,
PBYTE pb_TimerStatus) unsigned char * pb_TimerStatus)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_TimerStatus; DWORD dw_TimerStatus;
@ -949,7 +949,7 @@ INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
/* Read the timer status */ /* Read the timer status */
dw_TimerStatus = inl(devpriv->s_BoardInfos.ui_Address + 16 + (b_TimerNbr * 4) + (64 * b_ModulNbr)); dw_TimerStatus = inl(devpriv->s_BoardInfos.ui_Address + 16 + (b_TimerNbr * 4) + (64 * b_ModulNbr));
*pb_TimerStatus = (BYTE) ((dw_TimerStatus) >> 8) & 1; *pb_TimerStatus = (unsigned char) ((dw_TimerStatus) >> 8) & 1;
printk("ProgressStatus : %d", *pb_TimerStatus); printk("ProgressStatus : %d", *pb_TimerStatus);
} else { } else {
/* Timer not initialised see function */ /* Timer not initialised see function */
@ -976,9 +976,9 @@ INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_WriteTimerValue | | Function Name : _INT_ i_APCI1710_WriteTimerValue |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_TimerNbr, | | unsigned char_ b_TimerNbr, |
| ULONG_ ul_WriteValue) | | ULONG_ ul_WriteValue) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Write the value (ul_WriteValue) into the selected timer| | Task : Write the value (ul_WriteValue) into the selected timer|
@ -986,11 +986,11 @@ INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
| The action in depend of the time mode selection. | | The action in depend of the time mode selection. |
| See timer mode description table. | | See timer mode description table. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board |
| APCI-1710 | | APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number | | unsigned char_ b_ModulNbr : Selected module number |
| (0 to 3) | | (0 to 3) |
| BYTE_ b_TimerNbr : Timer number to write | | unsigned char_ b_TimerNbr : Timer number to write |
| (0 to 2) | | (0 to 2) |
| ULONG_ ul_WriteValue : Value to write | | ULONG_ ul_WriteValue : Value to write |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1007,7 +1007,7 @@ INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
*/ */
INT i_APCI1710_WriteTimerValue(struct comedi_device * dev, INT i_APCI1710_WriteTimerValue(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, unsigned char b_ModulNbr, unsigned char b_TimerNbr,
ULONG ul_WriteValue) ULONG ul_WriteValue)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;

12
drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
View file

@ -54,20 +54,20 @@ INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev, struct comedi_subdevice
* 82X54 READ & WRITE FUNCTION * 82X54 READ & WRITE FUNCTION
*/ */
INT i_APCI1710_ReadTimerValue(struct comedi_device *dev, INT i_APCI1710_ReadTimerValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, unsigned char b_ModulNbr, unsigned char b_TimerNbr,
PULONG pul_TimerValue); PULONG pul_TimerValue);
INT i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev, INT i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, unsigned char b_ModulNbr, unsigned char b_TimerNbr,
PBYTE pb_OutputLevel); unsigned char * pb_OutputLevel);
INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, unsigned char b_ModulNbr, unsigned char b_TimerNbr,
PBYTE pb_TimerStatus); unsigned char * pb_TimerStatus);
/* /*
* 82X54 WRITE FUNCTION * 82X54 WRITE FUNCTION
*/ */
INT i_APCI1710_WriteTimerValue(struct comedi_device *dev, INT i_APCI1710_WriteTimerValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, unsigned char b_ModulNbr, unsigned char b_TimerNbr,
ULONG ul_WriteValue); ULONG ul_WriteValue);

186
drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
View file

@ -62,11 +62,11 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_InitChrono | | Function Name : _INT_ i_APCI1710_InitChrono |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_ChronoMode, | | unsigned char_ b_ChronoMode, |
| BYTE_ b_PCIInputClock, | | unsigned char_ b_PCIInputClock, |
| BYTE_ b_TimingUnit, | | unsigned char_ b_TimingUnit, |
| ULONG_ ul_TimingInterval, | | ULONG_ ul_TimingInterval, |
| PULONG_ pul_RealTimingInterval) | PULONG_ pul_RealTimingInterval)
@ -88,12 +88,12 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| The mode 4 to 7 is appropriate for measuring the timing| | The mode 4 to 7 is appropriate for measuring the timing|
| between two event. | | between two event. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr CR_AREF(insn->chanspec) : Module number to configure | | unsigned char_ b_ModulNbr CR_AREF(insn->chanspec) : Module number to configure |
| (0 to 3) | | (0 to 3) |
| BYTE_ b_ChronoMode data[0] : Chronometer action mode | | unsigned char_ b_ChronoMode data[0] : Chronometer action mode |
| (0 to 7). | | (0 to 7). |
| BYTE_ b_PCIInputClock data[1] : Selection from PCI bus clock| | unsigned char_ b_PCIInputClock data[1] : Selection from PCI bus clock|
| - APCI1710_30MHZ : | | - APCI1710_30MHZ : |
| The PC have a PCI bus | | The PC have a PCI bus |
| clock from 30 MHz | | clock from 30 MHz |
@ -104,7 +104,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| The APCI-1710 have a | | The APCI-1710 have a |
| integrated 40Mhz | | integrated 40Mhz |
| quartz. | | quartz. |
| BYTE_ b_TimingUnit data[2] : Base timing unity (0 to 4) | | unsigned char_ b_TimingUnit data[2] : Base timing unity (0 to 4) |
| 0 : ns | | 0 : ns |
| 1 : µs | | 1 : µs |
| 2 : ms | | 2 : ms |
@ -141,12 +141,12 @@ INT i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su
double d_RealTimingInterval = 0; double d_RealTimingInterval = 0;
DWORD dw_ModeArray[8] = DWORD dw_ModeArray[8] =
{ 0x01, 0x05, 0x00, 0x04, 0x02, 0x0E, 0x0A, 0x06 }; { 0x01, 0x05, 0x00, 0x04, 0x02, 0x0E, 0x0A, 0x06 };
BYTE b_ModulNbr, b_ChronoMode, b_PCIInputClock, b_TimingUnit; unsigned char b_ModulNbr, b_ChronoMode, b_PCIInputClock, b_TimingUnit;
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_ChronoMode = (BYTE) data[0]; b_ChronoMode = (unsigned char) data[0];
b_PCIInputClock = (BYTE) data[1]; b_PCIInputClock = (unsigned char) data[1];
b_TimingUnit = (BYTE) data[2]; b_TimingUnit = (unsigned char) data[2];
ul_TimingInterval = (ULONG) data[3]; ul_TimingInterval = (ULONG) data[3];
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
@ -786,10 +786,10 @@ INT i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_EnableChrono | | Function Name : _INT_ i_APCI1710_EnableChrono |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_CycleMode, | | unsigned char_ b_CycleMode, |
| BYTE_ b_InterruptEnable) | unsigned char_ b_InterruptEnable)
INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev, INT i_APCI1710_InsnWriteEnableDisableChrono(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) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -810,12 +810,12 @@ struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) |
| witch the " i_APCI1710_EnableChrono" function, if no | | witch the " i_APCI1710_EnableChrono" function, if no |
| stop signal occur this start signal is ignored. | stop signal occur this start signal is ignored.
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr CR_AREF(chanspec) : Selected module number (0 to 3) | | unsigned char_ b_ModulNbr CR_AREF(chanspec) : Selected module number (0 to 3) |
data[0] ENABle/Disable chrono data[0] ENABle/Disable chrono
| BYTE_ b_CycleMode : Selected the chronometer | | unsigned char_ b_CycleMode : Selected the chronometer |
| data[1] acquisition mode | | data[1] acquisition mode |
| BYTE_ b_InterruptEnable : Enable or disable the | | unsigned char_ b_InterruptEnable : Enable or disable the |
| data[2] chronometer interrupt. | | data[2] chronometer interrupt. |
| APCI1710_ENABLE: | | APCI1710_ENABLE: |
| Enable the chronometer | | Enable the chronometer |
@ -844,11 +844,11 @@ INT i_APCI1710_InsnWriteEnableDisableChrono(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)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
BYTE b_ModulNbr, b_CycleMode, b_InterruptEnable, b_Action; unsigned char b_ModulNbr, b_CycleMode, b_InterruptEnable, b_Action;
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_Action = (BYTE) data[0]; b_Action = (unsigned char) data[0];
b_CycleMode = (BYTE) data[1]; b_CycleMode = (unsigned char) data[1];
b_InterruptEnable = (BYTE) data[2]; b_InterruptEnable = (unsigned char) data[2];
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
/**************************/ /**************************/
@ -1093,7 +1093,7 @@ struct comedi_insn *insn,unsigned int *data) |
INT i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevice * s, INT i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_insn * insn, unsigned int * data) struct comedi_insn * insn, unsigned int * data)
{ {
BYTE b_ReadType; unsigned char b_ReadType;
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
b_ReadType = CR_CHAN(insn->chanspec); b_ReadType = CR_CHAN(insn->chanspec);
@ -1101,23 +1101,23 @@ INT i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevic
switch (b_ReadType) { switch (b_ReadType) {
case APCI1710_CHRONO_PROGRESS_STATUS: case APCI1710_CHRONO_PROGRESS_STATUS:
i_ReturnValue = i_APCI1710_GetChronoProgressStatus(dev, i_ReturnValue = i_APCI1710_GetChronoProgressStatus(dev,
(BYTE) CR_AREF(insn->chanspec), (PBYTE) & data[0]); (unsigned char) CR_AREF(insn->chanspec), (unsigned char *) & data[0]);
break; break;
case APCI1710_CHRONO_READVALUE: case APCI1710_CHRONO_READVALUE:
i_ReturnValue = i_APCI1710_ReadChronoValue(dev, i_ReturnValue = i_APCI1710_ReadChronoValue(dev,
(BYTE) CR_AREF(insn->chanspec), (unsigned char) CR_AREF(insn->chanspec),
(UINT) insn->unused[0], (UINT) insn->unused[0],
(PBYTE) & data[0], (PULONG) & data[1]); (unsigned char *) & data[0], (PULONG) & data[1]);
break; break;
case APCI1710_CHRONO_CONVERTVALUE: case APCI1710_CHRONO_CONVERTVALUE:
i_ReturnValue = i_APCI1710_ConvertChronoValue(dev, i_ReturnValue = i_APCI1710_ConvertChronoValue(dev,
(BYTE) CR_AREF(insn->chanspec), (unsigned char) CR_AREF(insn->chanspec),
(ULONG) insn->unused[0], (ULONG) insn->unused[0],
(PULONG) & data[0], (PULONG) & data[0],
(PBYTE) & data[1], (unsigned char *) & data[1],
(PBYTE) & data[2], (unsigned char *) & data[2],
(PUINT) & data[3], (PUINT) & data[3],
(PUINT) & data[4], (PUINT) & data[5]); (PUINT) & data[4], (PUINT) & data[5]);
break; break;
@ -1159,15 +1159,15 @@ INT i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevic
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_GetChronoProgressStatus | | Function Name : _INT_ i_APCI1710_GetChronoProgressStatus |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| PBYTE_ pb_ChronoStatus) | | unsigned char *_ pb_ChronoStatus) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Return the chronometer status (pb_ChronoStatus) from | | Task : Return the chronometer status (pb_ChronoStatus) from |
| selected chronometer module (b_ModulNbr). | | selected chronometer module (b_ModulNbr). |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3) | | unsigned char_ b_ModulNbr : Selected module number (0 to 3) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PULONG_ pb_ChronoStatus : Return the chronometer | | Output Parameters : PULONG_ pb_ChronoStatus : Return the chronometer |
| status. | | status. |
@ -1195,7 +1195,7 @@ INT i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevic
*/ */
INT i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev, INT i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev,
BYTE b_ModulNbr, PBYTE pb_ChronoStatus) unsigned char b_ModulNbr, unsigned char * pb_ChronoStatus)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_Status; DWORD dw_Status;
@ -1295,10 +1295,10 @@ INT i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_ReadChronoValue | | Function Name : _INT_ i_APCI1710_ReadChronoValue |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| UINT_ ui_TimeOut, | | UINT_ ui_TimeOut, |
| PBYTE_ pb_ChronoStatus, | | unsigned char *_ pb_ChronoStatus, |
| PULONG_ pul_ChronoValue) | | PULONG_ pul_ChronoValue) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Return the chronometer status (pb_ChronoStatus) and the| | Task : Return the chronometer status (pb_ChronoStatus) and the|
@ -1323,8 +1323,8 @@ INT i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev,
| "i_APCI1710_InitChrono" function and the time unity is | | "i_APCI1710_InitChrono" function and the time unity is |
| the b_TimingUnit from "i_APCI1710_InitChrono" function| | the b_TimingUnit from "i_APCI1710_InitChrono" function|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3) | | unsigned char_ b_ModulNbr : Selected module number (0 to 3) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PULONG_ pb_ChronoStatus : Return the chronometer | | Output Parameters : PULONG_ pb_ChronoStatus : Return the chronometer |
| status. | | status. |
@ -1356,8 +1356,8 @@ INT i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev,
*/ */
INT i_APCI1710_ReadChronoValue(struct comedi_device * dev, INT i_APCI1710_ReadChronoValue(struct comedi_device * dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
UINT ui_TimeOut, PBYTE pb_ChronoStatus, PULONG pul_ChronoValue) UINT ui_TimeOut, unsigned char * pb_ChronoStatus, PULONG pul_ChronoValue)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_Status; DWORD dw_Status;
@ -1581,12 +1581,12 @@ INT i_APCI1710_ReadChronoValue(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_ConvertChronoValue | | Function Name : _INT_ i_APCI1710_ConvertChronoValue |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| ULONG_ ul_ChronoValue, | | ULONG_ ul_ChronoValue, |
| PULONG_ pul_Hour, | | PULONG_ pul_Hour, |
| PBYTE_ pb_Minute, | | unsigned char *_ pb_Minute, |
| PBYTE_ pb_Second, | | unsigned char *_ pb_Second, |
| PUINT_ pui_MilliSecond, | | PUINT_ pui_MilliSecond, |
| PUINT_ pui_MicroSecond, | | PUINT_ pui_MicroSecond, |
| PUINT_ pui_NanoSecond) | | PUINT_ pui_NanoSecond) |
@ -1594,15 +1594,15 @@ INT i_APCI1710_ReadChronoValue(struct comedi_device * dev,
| Task : Convert the chronometer measured timing | | Task : Convert the chronometer measured timing |
| (ul_ChronoValue) in to h, mn, s, ms, µs, ns. | | (ul_ChronoValue) in to h, mn, s, ms, µs, ns. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3)| | unsigned char_ b_ModulNbr : Selected module number (0 to 3)|
| ULONG_ ul_ChronoValue : Measured chronometer timing | | ULONG_ ul_ChronoValue : Measured chronometer timing |
| value. | | value. |
| See"i_APCI1710_ReadChronoValue"| | See"i_APCI1710_ReadChronoValue"|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PULONG_ pul_Hour : Chronometer timing hour | | Output Parameters : PULONG_ pul_Hour : Chronometer timing hour |
| PBYTE_ pb_Minute : Chronometer timing minute | | unsigned char *_ pb_Minute : Chronometer timing minute |
| PBYTE_ pb_Second : Chronometer timing second | | unsigned char *_ pb_Second : Chronometer timing second |
| PUINT_ pui_MilliSecond : Chronometer timing mini | | PUINT_ pui_MilliSecond : Chronometer timing mini |
| second | | second |
| PUINT_ pui_MicroSecond : Chronometer timing micro | | PUINT_ pui_MicroSecond : Chronometer timing micro |
@ -1620,11 +1620,11 @@ INT i_APCI1710_ReadChronoValue(struct comedi_device * dev,
*/ */
INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev, INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
ULONG ul_ChronoValue, ULONG ul_ChronoValue,
PULONG pul_Hour, PULONG pul_Hour,
PBYTE pb_Minute, unsigned char * pb_Minute,
PBYTE pb_Second, unsigned char * pb_Second,
PUINT pui_MilliSecond, PUINT pui_MicroSecond, PUINT pui_NanoSecond) PUINT pui_MilliSecond, PUINT pui_MicroSecond, PUINT pui_NanoSecond)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -1689,7 +1689,7 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev,
d_Minute = d_Hour - *pul_Hour; d_Minute = d_Hour - *pul_Hour;
d_Minute = d_Minute * 60; d_Minute = d_Minute * 60;
*pb_Minute = (BYTE) d_Minute; *pb_Minute = (unsigned char) d_Minute;
/************************/ /************************/
/* Calculate the second */ /* Calculate the second */
@ -1697,7 +1697,7 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev,
d_Second = d_Minute - *pb_Minute; d_Second = d_Minute - *pb_Minute;
d_Second = d_Second * 60; d_Second = d_Second * 60;
*pb_Second = (BYTE) d_Second; *pb_Second = (unsigned char) d_Second;
/*****************************/ /*****************************/
/* Calculate the mini second */ /* Calculate the mini second */
@ -1764,9 +1764,9 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev,
| parameter b_Channel. Setting an output means setting an| | parameter b_Channel. Setting an output means setting an|
| output high. | | output high. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3)| | unsigned char_ b_ModulNbr : Selected module number (0 to 3)|
| BYTE_ b_OutputChannel : Selection from digital output | | unsigned char_ b_OutputChannel : Selection from digital output |
| CR_CHAN() channel (0 to 2) | | CR_CHAN() channel (0 to 2) |
| 0 : Channel H | | 0 : Channel H |
| 1 : Channel A | | 1 : Channel A |
@ -1787,19 +1787,19 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_SetChronoChlOff | | Function Name : _INT_ i_APCI1710_SetChronoChlOff |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_OutputChannel) | | unsigned char_ b_OutputChannel) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Resets the output witch has been passed with the | | Task : Resets the output witch has been passed with the |
| parameter b_Channel. Resetting an output means setting | | parameter b_Channel. Resetting an output means setting |
| an output low. | | an output low. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710
data[0] : Chl ON, Chl OFF , Chl Read , Port Read data[0] : Chl ON, Chl OFF , Chl Read , Port Read
| BYTE_ b_ModulNbr CR_AREF : Selected module number (0 to 3)| | unsigned char_ b_ModulNbr CR_AREF : Selected module number (0 to 3)|
| BYTE_ b_OutputChannel CR_CHAN : Selection from digital output | | unsigned char_ b_OutputChannel CR_CHAN : Selection from digital output |
| channel (0 to 2) | | channel (0 to 2) |
| 0 : Channel H | | 0 : Channel H |
| 1 : Channel A | | 1 : Channel A |
@ -1820,24 +1820,24 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_ReadChronoChlValue | | Function Name : _INT_ i_APCI1710_ReadChronoChlValue |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_InputChannel, | | unsigned char_ b_InputChannel, |
| PBYTE_ pb_ChannelStatus) | | unsigned char *_ pb_ChannelStatus) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Return the status from selected digital input | | Task : Return the status from selected digital input |
| (b_InputChannel) from selected chronometer | | (b_InputChannel) from selected chronometer |
| module (b_ModulNbr). | | module (b_ModulNbr). |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3)| | unsigned char_ b_ModulNbr : Selected module number (0 to 3)|
| BYTE_ b_InputChannel : Selection from digital input | | unsigned char_ b_InputChannel : Selection from digital input |
| channel (0 to 2) | | channel (0 to 2) |
| CR_CHAN() 0 : Channel E | | CR_CHAN() 0 : Channel E |
| 1 : Channel F | | 1 : Channel F |
| 2 : Channel G | | 2 : Channel G |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PBYTE_ pb_ChannelStatus : Digital input channel status.| | Output Parameters : unsigned char *_ pb_ChannelStatus : Digital input channel status.|
| data[0] 0 : Channel is not active | | data[0] 0 : Channel is not active |
| 1 : Channel is active | | 1 : Channel is active |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1854,17 +1854,17 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_ReadChronoPortValue | | Function Name : _INT_ i_APCI1710_ReadChronoPortValue |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| PBYTE_ pb_PortValue) | | unsigned char *_ pb_PortValue) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Return the status from digital inputs port from | | Task : Return the status from digital inputs port from |
| selected (b_ModulNbr) chronometer module. | | selected (b_ModulNbr) chronometer module. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3)| | unsigned char_ b_ModulNbr : Selected module number (0 to 3)|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PBYTE_ pb_PortValue : Digital inputs port status. | Output Parameters : unsigned char *_ pb_PortValue : Digital inputs port status.
| data[0] | data[0]
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Return Value : 0: No error | | Return Value : 0: No error |
@ -1880,14 +1880,14 @@ INT i_APCI1710_InsnBitsChronoDigitalIO(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)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
BYTE b_ModulNbr, b_OutputChannel, b_InputChannel, b_IOType; unsigned char b_ModulNbr, b_OutputChannel, b_InputChannel, b_IOType;
DWORD dw_Status; DWORD dw_Status;
PBYTE pb_ChannelStatus; unsigned char * pb_ChannelStatus;
PBYTE pb_PortValue; unsigned char * pb_PortValue;
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
b_IOType = (BYTE) data[0]; b_IOType = (unsigned char) data[0];
/**************************/ /**************************/
/* Test the module number */ /* Test the module number */
@ -1915,7 +1915,7 @@ INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev,
case APCI1710_CHRONO_SET_CHANNELOFF: case APCI1710_CHRONO_SET_CHANNELOFF:
b_OutputChannel = b_OutputChannel =
(BYTE) CR_CHAN(insn->chanspec); (unsigned char) CR_CHAN(insn->chanspec);
if (b_OutputChannel <= 2) { if (b_OutputChannel <= 2) {
outl(0, devpriv->s_BoardInfos. outl(0, devpriv->s_BoardInfos.
@ -1938,7 +1938,7 @@ INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev,
case APCI1710_CHRONO_SET_CHANNELON: case APCI1710_CHRONO_SET_CHANNELON:
b_OutputChannel = b_OutputChannel =
(BYTE) CR_CHAN(insn->chanspec); (unsigned char) CR_CHAN(insn->chanspec);
if (b_OutputChannel <= 2) { if (b_OutputChannel <= 2) {
outl(1, devpriv->s_BoardInfos. outl(1, devpriv->s_BoardInfos.
@ -1962,9 +1962,9 @@ INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev,
/**********************************/ /**********************************/
/* Test the digital input channel */ /* Test the digital input channel */
/**********************************/ /**********************************/
pb_ChannelStatus = (PBYTE) & data[0]; pb_ChannelStatus = (unsigned char *) & data[0];
b_InputChannel = b_InputChannel =
(BYTE) CR_CHAN(insn->chanspec); (unsigned char) CR_CHAN(insn->chanspec);
if (b_InputChannel <= 2) { if (b_InputChannel <= 2) {
@ -1975,7 +1975,7 @@ INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev,
(64 * b_ModulNbr)); (64 * b_ModulNbr));
*pb_ChannelStatus = *pb_ChannelStatus =
(BYTE) (((dw_Status >> (unsigned char) (((dw_Status >>
b_InputChannel) b_InputChannel)
& 1) ^ 1); & 1) ^ 1);
} // if ((b_InputChannel >= 0) && (b_InputChannel <= 2)) } // if ((b_InputChannel >= 0) && (b_InputChannel <= 2))
@ -1992,7 +1992,7 @@ INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev,
case APCI1710_CHRONO_READ_PORT: case APCI1710_CHRONO_READ_PORT:
pb_PortValue = (PBYTE) & data[0]; pb_PortValue = (unsigned char *) & data[0];
dw_Status = dw_Status =
inl(devpriv->s_BoardInfos. inl(devpriv->s_BoardInfos.
@ -2000,7 +2000,7 @@ INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev,
(64 * b_ModulNbr)); (64 * b_ModulNbr));
*pb_PortValue = *pb_PortValue =
(BYTE) ((dw_Status & 0x7) ^ 7); (unsigned char) ((dw_Status & 0x7) ^ 7);
break; break;
} }
} else { } else {

12
drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
View file

@ -50,19 +50,19 @@ INT i_APCI1710_InsnReadChrono(struct comedi_device *dev, struct comedi_subdevice
struct comedi_insn *insn, unsigned int *data); struct comedi_insn *insn, unsigned int *data);
INT i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev, INT i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_ChronoStatus); unsigned char b_ModulNbr, unsigned char * pb_ChronoStatus);
INT i_APCI1710_ReadChronoValue(struct comedi_device *dev, INT i_APCI1710_ReadChronoValue(struct comedi_device *dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
UINT ui_TimeOut, PBYTE pb_ChronoStatus, UINT ui_TimeOut, unsigned char * pb_ChronoStatus,
PULONG pul_ChronoValue); PULONG pul_ChronoValue);
INT i_APCI1710_ConvertChronoValue(struct comedi_device *dev, INT i_APCI1710_ConvertChronoValue(struct comedi_device *dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
ULONG ul_ChronoValue, ULONG ul_ChronoValue,
PULONG pul_Hour, PULONG pul_Hour,
PBYTE pb_Minute, unsigned char * pb_Minute,
PBYTE pb_Second, unsigned char * pb_Second,
PUINT pui_MilliSecond, PUINT pui_MicroSecond, PUINT pui_MilliSecond, PUINT pui_MicroSecond,
PUINT pui_NanoSecond); PUINT pui_NanoSecond);

88
drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
View file

@ -70,14 +70,14 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| I/O. | | I/O. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : | | Input Parameters : |
| BYTE_ b_ModulNbr data[0]: Module number to | | unsigned char_ b_ModulNbr data[0]: Module number to |
| configure (0 to 3) | | configure (0 to 3) |
| BYTE_ b_ChannelAMode data[1] : Channel A mode selection | | unsigned char_ b_ChannelAMode data[1] : Channel A mode selection |
| 0 : Channel used for digital | | 0 : Channel used for digital |
| input | | input |
| 1 : Channel used for digital | | 1 : Channel used for digital |
| output | | output |
| BYTE_ b_ChannelBMode data[2] : Channel B mode selection | | unsigned char_ b_ChannelBMode data[2] : Channel B mode selection |
| 0 : Channel used for digital | | 0 : Channel used for digital |
| input | | input |
| 1 : Channel used for digital | | 1 : Channel used for digital |
@ -102,16 +102,16 @@ Activates and deactivates the digital output memory.
INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_subdevice * s, INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_insn * insn, unsigned int * data) struct comedi_insn * insn, unsigned int * data)
{ {
BYTE b_ModulNbr, b_ChannelAMode, b_ChannelBMode; unsigned char b_ModulNbr, b_ChannelAMode, b_ChannelBMode;
BYTE b_MemoryOnOff, b_ConfigType; unsigned char b_MemoryOnOff, b_ConfigType;
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_WriteConfig = 0; DWORD dw_WriteConfig = 0;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_ConfigType = (BYTE) data[0]; // Memory or Init b_ConfigType = (unsigned char) data[0]; // Memory or Init
b_ChannelAMode = (BYTE) data[1]; b_ChannelAMode = (unsigned char) data[1];
b_ChannelBMode = (BYTE) data[2]; b_ChannelBMode = (unsigned char) data[2];
b_MemoryOnOff = (BYTE) data[1]; // if memory operation b_MemoryOnOff = (unsigned char) data[1]; // if memory operation
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
/**************************/ /**************************/
@ -257,9 +257,9 @@ INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_sub
| |
| BYTE_ b_ModulNbr CR_AREF(chanspec) : Selected module number | | unsigned char_ b_ModulNbr CR_AREF(chanspec) : Selected module number |
| (0 to 3) | | (0 to 3) |
| BYTE_ b_InputChannel CR_CHAN(chanspec) : Selection from digital | | unsigned char_ b_InputChannel CR_CHAN(chanspec) : Selection from digital |
| input ( 0 to 6) | | input ( 0 to 6) |
| 0 : Channel C | | 0 : Channel C |
| 1 : Channel D | | 1 : Channel D |
@ -288,22 +288,22 @@ INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_sub
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
//_INT_ i_APCI1710_ReadDigitalIOChlValue (BYTE_ b_BoardHandle, //_INT_ i_APCI1710_ReadDigitalIOChlValue (unsigned char_ b_BoardHandle,
// BYTE_ b_ModulNbr, // unsigned char_ b_ModulNbr,
// BYTE_ b_InputChannel, // unsigned char_ b_InputChannel,
// //
// PBYTE_ pb_ChannelStatus) // unsigned char *_ pb_ChannelStatus)
INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, INT i_APCI1710_InsnReadDigitalIOChlValue(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)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_StatusReg; DWORD dw_StatusReg;
BYTE b_ModulNbr, b_InputChannel; unsigned char b_ModulNbr, b_InputChannel;
PBYTE pb_ChannelStatus; unsigned char * pb_ChannelStatus;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_InputChannel = (BYTE) CR_CHAN(insn->chanspec); b_InputChannel = (unsigned char) CR_CHAN(insn->chanspec);
data[0] = 0; data[0] = 0;
pb_ChannelStatus = (PBYTE) & data[0]; pb_ChannelStatus = (unsigned char *) & data[0];
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
/**************************/ /**************************/
@ -400,7 +400,7 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev,
(64 * b_ModulNbr)); (64 * b_ModulNbr));
*pb_ChannelStatus = *pb_ChannelStatus =
(BYTE) ((dw_StatusReg ^ (unsigned char) ((dw_StatusReg ^
0x1C) >> 0x1C) >>
b_InputChannel) & 1; b_InputChannel) & 1;
@ -453,9 +453,9 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev,
| parameter b_Channel. Setting an output means setting | | parameter b_Channel. Setting an output means setting |
| an ouput high. | | an ouput high. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr (aref ) : Selected module number (0 to 3)| | unsigned char_ b_ModulNbr (aref ) : Selected module number (0 to 3)|
| BYTE_ b_OutputChannel (CR_CHAN) : Selection from digital output | | unsigned char_ b_OutputChannel (CR_CHAN) : Selection from digital output |
| channel (0 to 2) | | channel (0 to 2) |
| 0 : Channel H | | 0 : Channel H |
| 1 : Channel A | | 1 : Channel A |
@ -478,15 +478,15 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
//_INT_ i_APCI1710_SetDigitalIOChlOn (BYTE_ b_BoardHandle, //_INT_ i_APCI1710_SetDigitalIOChlOn (unsigned char_ b_BoardHandle,
// BYTE_ b_ModulNbr, // unsigned char_ b_ModulNbr,
// BYTE_ b_OutputChannel) // unsigned char_ b_OutputChannel)
INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev, INT i_APCI1710_InsnWriteDigitalIOChlOnOff(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)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_WriteValue = 0; DWORD dw_WriteValue = 0;
BYTE b_ModulNbr, b_OutputChannel; unsigned char b_ModulNbr, b_OutputChannel;
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_OutputChannel = CR_CHAN(insn->chanspec); b_OutputChannel = CR_CHAN(insn->chanspec);
@ -690,9 +690,9 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev,
| from selected digital I/O module (b_ModulNbr) | from selected digital I/O module (b_ModulNbr)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : | Input Parameters :
BYTE_ b_BoardHandle : Handle of board APCI-1710 | unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr CR_AREF(aref) : Selected module number (0 to 3)| | unsigned char_ b_ModulNbr CR_AREF(aref) : Selected module number (0 to 3)|
| BYTE_ 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
@ -725,26 +725,26 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
//_INT_ i_APCI1710_SetDigitalIOPortOn (BYTE_ b_BoardHandle, //_INT_ i_APCI1710_SetDigitalIOPortOn (unsigned char_ b_BoardHandle,
// BYTE_ b_ModulNbr, // unsigned char_ b_ModulNbr,
// BYTE_ b_PortValue) // unsigned char_ b_PortValue)
INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev, INT i_APCI1710_InsnBitsDigitalIOPortOnOff(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)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_WriteValue = 0; DWORD dw_WriteValue = 0;
DWORD dw_StatusReg; DWORD dw_StatusReg;
BYTE b_ModulNbr, b_PortValue; unsigned char b_ModulNbr, b_PortValue;
BYTE b_PortOperation, b_PortOnOFF; unsigned char b_PortOperation, b_PortOnOFF;
PBYTE pb_PortValue; unsigned char * pb_PortValue;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_PortOperation = (BYTE) data[0]; // Input or output b_PortOperation = (unsigned char) data[0]; // Input or output
b_PortOnOFF = (BYTE) data[1]; // if output then On or Off b_PortOnOFF = (unsigned char) data[1]; // if output then On or Off
b_PortValue = (BYTE) data[2]; // if out put then Value b_PortValue = (unsigned char) data[2]; // if out put then Value
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
pb_PortValue = (PBYTE) & data[0]; pb_PortValue = (unsigned char *) & data[0];
// if input then read value // if input then read value
switch (b_PortOperation) { switch (b_PortOperation) {
@ -781,7 +781,7 @@ INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev,
inl(devpriv->s_BoardInfos. inl(devpriv->s_BoardInfos.
ui_Address + (64 * b_ModulNbr)); ui_Address + (64 * b_ModulNbr));
*pb_PortValue = *pb_PortValue =
(BYTE) (dw_StatusReg ^ 0x1C); (unsigned char) (dw_StatusReg ^ 0x1C);
} else { } else {
/*******************************/ /*******************************/

622
drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
View file

File diff suppressed because it is too large Load diff

104
drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
View file

@ -148,124 +148,124 @@ INT i_APCI1710_InsnReadINCCPT(struct comedi_device *dev, struct comedi_subdevice
/* INSN CONFIG */ /* INSN CONFIG */
INT i_APCI1710_InitCounter(struct comedi_device *dev, INT i_APCI1710_InitCounter(struct comedi_device *dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_CounterRange, unsigned char b_CounterRange,
BYTE b_FirstCounterModus, unsigned char b_FirstCounterModus,
BYTE b_FirstCounterOption, unsigned char b_FirstCounterOption,
BYTE b_SecondCounterModus, unsigned char b_SecondCounterModus,
BYTE b_SecondCounterOption); unsigned char b_SecondCounterOption);
INT i_APCI1710_CounterAutoTest(struct comedi_device *dev, PBYTE pb_TestStatus); INT i_APCI1710_CounterAutoTest(struct comedi_device *dev, unsigned char * pb_TestStatus);
INT i_APCI1710_InitIndex(struct comedi_device *dev, INT i_APCI1710_InitIndex(struct comedi_device *dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_ReferenceAction, unsigned char b_ReferenceAction,
BYTE b_IndexOperation, BYTE b_AutoMode, unsigned char b_IndexOperation, unsigned char b_AutoMode,
BYTE b_InterruptEnable); unsigned char b_InterruptEnable);
INT i_APCI1710_InitReference(struct comedi_device *dev, INT i_APCI1710_InitReference(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ReferenceLevel); unsigned char b_ModulNbr, unsigned char b_ReferenceLevel);
INT i_APCI1710_InitExternalStrobe(struct comedi_device *dev, INT i_APCI1710_InitExternalStrobe(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ExternalStrobe, unsigned char b_ModulNbr, unsigned char b_ExternalStrobe,
BYTE b_ExternalStrobeLevel); unsigned char b_ExternalStrobeLevel);
INT i_APCI1710_InitCompareLogic(struct comedi_device *dev, INT i_APCI1710_InitCompareLogic(struct comedi_device *dev,
BYTE b_ModulNbr, UINT ui_CompareValue); unsigned char b_ModulNbr, UINT ui_CompareValue);
INT i_APCI1710_InitFrequencyMeasurement(struct comedi_device *dev, INT i_APCI1710_InitFrequencyMeasurement(struct comedi_device *dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_PCIInputClock, unsigned char b_PCIInputClock,
BYTE b_TimingUnity, unsigned char b_TimingUnity,
ULONG ul_TimingInterval, ULONG ul_TimingInterval,
PULONG pul_RealTimingInterval); PULONG pul_RealTimingInterval);
/* INSN BITS */ /* INSN BITS */
INT i_APCI1710_ClearCounterValue(struct comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_ClearCounterValue(struct comedi_device *dev, unsigned char b_ModulNbr);
INT i_APCI1710_ClearAllCounterValue(struct comedi_device *dev); INT i_APCI1710_ClearAllCounterValue(struct comedi_device *dev);
INT i_APCI1710_SetInputFilter(struct comedi_device *dev, INT i_APCI1710_SetInputFilter(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_PCIInputClock, unsigned char b_ModulNbr, unsigned char b_PCIInputClock,
BYTE b_Filter); unsigned char b_Filter);
INT i_APCI1710_LatchCounter(struct comedi_device *dev, INT i_APCI1710_LatchCounter(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_LatchReg); unsigned char b_ModulNbr, unsigned char b_LatchReg);
INT i_APCI1710_SetIndexAndReferenceSource(struct comedi_device *dev, INT i_APCI1710_SetIndexAndReferenceSource(struct comedi_device *dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_SourceSelection); unsigned char b_SourceSelection);
INT i_APCI1710_SetDigitalChlOn(struct comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_SetDigitalChlOn(struct comedi_device *dev, unsigned char b_ModulNbr);
INT i_APCI1710_SetDigitalChlOff(struct comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_SetDigitalChlOff(struct comedi_device *dev, unsigned char b_ModulNbr);
/* INSN WRITE */ /* INSN WRITE */
INT i_APCI1710_EnableLatchInterrupt(struct comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_EnableLatchInterrupt(struct comedi_device *dev, unsigned char b_ModulNbr);
INT i_APCI1710_DisableLatchInterrupt(struct comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_DisableLatchInterrupt(struct comedi_device *dev, unsigned char b_ModulNbr);
INT i_APCI1710_Write16BitCounterValue(struct comedi_device *dev, INT i_APCI1710_Write16BitCounterValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_SelectedCounter, unsigned char b_ModulNbr, unsigned char b_SelectedCounter,
UINT ui_WriteValue); UINT ui_WriteValue);
INT i_APCI1710_Write32BitCounterValue(struct comedi_device *dev, INT i_APCI1710_Write32BitCounterValue(struct comedi_device *dev,
BYTE b_ModulNbr, ULONG ul_WriteValue); unsigned char b_ModulNbr, ULONG ul_WriteValue);
INT i_APCI1710_EnableIndex(struct comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_EnableIndex(struct comedi_device *dev, unsigned char b_ModulNbr);
INT i_APCI1710_DisableIndex(struct comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_DisableIndex(struct comedi_device *dev, unsigned char b_ModulNbr);
INT i_APCI1710_EnableCompareLogic(struct comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_EnableCompareLogic(struct comedi_device *dev, unsigned char b_ModulNbr);
INT i_APCI1710_DisableCompareLogic(struct comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_DisableCompareLogic(struct comedi_device *dev, unsigned char b_ModulNbr);
INT i_APCI1710_EnableFrequencyMeasurement(struct comedi_device *dev, INT i_APCI1710_EnableFrequencyMeasurement(struct comedi_device *dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_InterruptEnable); unsigned char b_InterruptEnable);
INT i_APCI1710_DisableFrequencyMeasurement(struct comedi_device *dev, INT i_APCI1710_DisableFrequencyMeasurement(struct comedi_device *dev,
BYTE b_ModulNbr); unsigned char b_ModulNbr);
/* INSN READ */ /* INSN READ */
INT i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev, INT i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_LatchReg, unsigned char b_ModulNbr, unsigned char b_LatchReg,
PBYTE pb_LatchStatus); unsigned char * pb_LatchStatus);
INT i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev, INT i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_LatchReg, unsigned char b_ModulNbr, unsigned char b_LatchReg,
PULONG pul_LatchValue); PULONG pul_LatchValue);
INT i_APCI1710_Read16BitCounterValue(struct comedi_device *dev, INT i_APCI1710_Read16BitCounterValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_SelectedCounter, unsigned char b_ModulNbr, unsigned char b_SelectedCounter,
PUINT pui_CounterValue); PUINT pui_CounterValue);
INT i_APCI1710_Read32BitCounterValue(struct comedi_device *dev, INT i_APCI1710_Read32BitCounterValue(struct comedi_device *dev,
BYTE b_ModulNbr, PULONG pul_CounterValue); unsigned char b_ModulNbr, PULONG pul_CounterValue);
INT i_APCI1710_GetIndexStatus(struct comedi_device *dev, INT i_APCI1710_GetIndexStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_IndexStatus); unsigned char b_ModulNbr, unsigned char * pb_IndexStatus);
INT i_APCI1710_GetReferenceStatus(struct comedi_device *dev, INT i_APCI1710_GetReferenceStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_ReferenceStatus); unsigned char b_ModulNbr, unsigned char * pb_ReferenceStatus);
INT i_APCI1710_GetUASStatus(struct comedi_device *dev, INT i_APCI1710_GetUASStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_UASStatus); unsigned char b_ModulNbr, unsigned char * pb_UASStatus);
INT i_APCI1710_GetCBStatus(struct comedi_device *dev, INT i_APCI1710_GetCBStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_CBStatus); unsigned char b_ModulNbr, unsigned char * pb_CBStatus);
INT i_APCI1710_Get16BitCBStatus(struct comedi_device *dev, INT i_APCI1710_Get16BitCBStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_CBStatusCounter0, unsigned char b_ModulNbr, unsigned char * pb_CBStatusCounter0,
PBYTE pb_CBStatusCounter1); unsigned char * pb_CBStatusCounter1);
INT i_APCI1710_GetUDStatus(struct comedi_device *dev, INT i_APCI1710_GetUDStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_UDStatus); unsigned char b_ModulNbr, unsigned char * pb_UDStatus);
INT i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device *dev, INT i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_UDStatus); unsigned char b_ModulNbr, unsigned char * pb_UDStatus);
INT i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev, INT i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
PBYTE pb_Status, PBYTE pb_UDStatus, unsigned char * pb_Status, unsigned char * pb_UDStatus,
PULONG pul_ReadValue); PULONG pul_ReadValue);

138
drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
View file

@ -60,11 +60,11 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_InitPulseEncoder | | Function Name : _INT_ i_APCI1710_InitPulseEncoder |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_PulseEncoderNbr, | | unsigned char_ b_PulseEncoderNbr, |
| BYTE_ b_InputLevelSelection, | | unsigned char_ b_InputLevelSelection, |
| BYTE_ b_TriggerOutputAction, | | unsigned char_ b_TriggerOutputAction, |
| ULONG_ ul_StartValue) | | ULONG_ ul_StartValue) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configure the pulse encoder operating mode selected via| | Task : Configure the pulse encoder operating mode selected via|
@ -74,12 +74,12 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| You must calling this function be for you call any | | You must calling this function be for you call any |
| other function witch access of pulse encoders. | | other function witch access of pulse encoders. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710| | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710|
| BYTE_ b_ModulNbr : Module number to | | unsigned char_ b_ModulNbr : Module number to |
| configure (0 to 3) | | configure (0 to 3) |
| BYTE_ b_PulseEncoderNbr : Pulse encoder selection | | unsigned char_ b_PulseEncoderNbr : Pulse encoder selection |
| (0 to 3) | | (0 to 3) |
| BYTE_ b_InputLevelSelection : Input level selection | | unsigned char_ b_InputLevelSelection : Input level selection |
| (0 or 1) | | (0 or 1) |
| 0 : Set pulse encoder| | 0 : Set pulse encoder|
| count the the low| | count the the low|
@ -87,7 +87,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| 1 : Set pulse encoder| | 1 : Set pulse encoder|
| count the the | | count the the |
| high level pulse.| | high level pulse.|
| BYTE_ b_TriggerOutputAction : Digital TRIGGER output | | unsigned char_ b_TriggerOutputAction : Digital TRIGGER output |
| action | | action |
| 0 : No action | | 0 : No action |
| 1 : Set the trigger | | 1 : Set the trigger |
@ -104,10 +104,10 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| encoder | | encoder |
| ULONG_ ul_StartValue : Pulse encoder start value| | ULONG_ ul_StartValue : Pulse encoder start value|
| (1 to 4294967295) | (1 to 4294967295)
b_ModulNbr =(BYTE) CR_AREF(insn->chanspec); b_ModulNbr =(unsigned char) CR_AREF(insn->chanspec);
b_PulseEncoderNbr =(BYTE) data[0]; b_PulseEncoderNbr =(unsigned char) data[0];
b_InputLevelSelection =(BYTE) data[1]; b_InputLevelSelection =(unsigned char) data[1];
b_TriggerOutputAction =(BYTE) data[2]; b_TriggerOutputAction =(unsigned char) data[2];
ul_StartValue =(ULONG) data[3]; ul_StartValue =(ULONG) data[3];
| |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -129,16 +129,16 @@ INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev,
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_IntRegister; DWORD dw_IntRegister;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_PulseEncoderNbr; unsigned char b_PulseEncoderNbr;
BYTE b_InputLevelSelection; unsigned char b_InputLevelSelection;
BYTE b_TriggerOutputAction; unsigned char b_TriggerOutputAction;
ULONG ul_StartValue; ULONG ul_StartValue;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_PulseEncoderNbr = (BYTE) data[0]; b_PulseEncoderNbr = (unsigned char) data[0];
b_InputLevelSelection = (BYTE) data[1]; b_InputLevelSelection = (unsigned char) data[1];
b_TriggerOutputAction = (BYTE) data[2]; b_TriggerOutputAction = (unsigned char) data[2];
ul_StartValue = (ULONG) data[3]; ul_StartValue = (ULONG) data[3];
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
@ -352,11 +352,11 @@ INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_EnablePulseEncoder | | Function Name : _INT_ i_APCI1710_EnablePulseEncoder |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_PulseEncoderNbr, | | unsigned char_ b_PulseEncoderNbr, |
| BYTE_ b_CycleSelection, | | unsigned char_ b_CycleSelection, |
| BYTE_ b_InterruptHandling) | | unsigned char_ b_InterruptHandling) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Enableor disable the selected pulse encoder (b_PulseEncoderNbr) | | Task : Enableor disable the selected pulse encoder (b_PulseEncoderNbr) |
| from selected module (b_ModulNbr). Each input pulse | | from selected module (b_ModulNbr). Each input pulse |
@ -365,12 +365,12 @@ INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev,
| interrupt is generated when the pulse encoder has run | | interrupt is generated when the pulse encoder has run |
| down. | | down. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710| | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710|
| BYTE_ b_ModulNbr : Module number to | | unsigned char_ b_ModulNbr : Module number to |
| configure (0 to 3) | | configure (0 to 3) |
| BYTE_ b_PulseEncoderNbr : Pulse encoder selection | | unsigned char_ b_PulseEncoderNbr : Pulse encoder selection |
| (0 to 3) | | (0 to 3) |
| BYTE_ b_CycleSelection : APCI1710_CONTINUOUS: | | unsigned char_ b_CycleSelection : APCI1710_CONTINUOUS: |
| Each time the | | Each time the |
| counting value is set| | counting value is set|
| on "0", the pulse | | on "0", the pulse |
@ -381,7 +381,7 @@ INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev,
| If the counter is set| | If the counter is set|
| on "0", the pulse | | on "0", the pulse |
| encoder is stopped. | | encoder is stopped. |
| BYTE_ b_InterruptHandling : Interrupts can be | | unsigned char_ b_InterruptHandling : Interrupts can be |
| generated, when the pulse| | generated, when the pulse|
| encoder has run down. | | encoder has run down. |
| With this parameter the | | With this parameter the |
@ -393,11 +393,11 @@ INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev,
| APCI1710_DISABLE: | | APCI1710_DISABLE: |
| Interrupts are disabled | Interrupts are disabled
b_ModulNbr =(BYTE) CR_AREF(insn->chanspec); b_ModulNbr =(unsigned char) CR_AREF(insn->chanspec);
b_Action =(BYTE) data[0]; b_Action =(unsigned char) data[0];
b_PulseEncoderNbr =(BYTE) data[1]; b_PulseEncoderNbr =(unsigned char) data[1];
b_CycleSelection =(BYTE) data[2]; b_CycleSelection =(unsigned char) data[2];
b_InterruptHandling =(BYTE) data[3];| b_InterruptHandling =(unsigned char) data[3];|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -418,18 +418,18 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(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)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_PulseEncoderNbr; unsigned char b_PulseEncoderNbr;
BYTE b_CycleSelection; unsigned char b_CycleSelection;
BYTE b_InterruptHandling; unsigned char b_InterruptHandling;
BYTE b_Action; unsigned char b_Action;
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_Action = (BYTE) data[0]; b_Action = (unsigned char) data[0];
b_PulseEncoderNbr = (BYTE) data[1]; b_PulseEncoderNbr = (unsigned char) data[1];
b_CycleSelection = (BYTE) data[2]; b_CycleSelection = (unsigned char) data[2];
b_InterruptHandling = (BYTE) data[3]; b_InterruptHandling = (unsigned char) data[3];
/***********************************/ /***********************************/
/* Test the selected module number */ /* Test the selected module number */
@ -662,33 +662,33 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_ReadPulseEncoderStatus | | Function Name : _INT_ i_APCI1710_ReadPulseEncoderStatus |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_PulseEncoderNbr, | | unsigned char_ b_PulseEncoderNbr, |
| PBYTE_ pb_Status) | | unsigned char *_ pb_Status) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task APCI1710_PULSEENCODER_READ : Reads the pulse encoder status | Task APCI1710_PULSEENCODER_READ : Reads the pulse encoder status
and valuefrom selected pulse | and valuefrom selected pulse |
| encoder (b_PulseEncoderNbr) from selected module | | encoder (b_PulseEncoderNbr) from selected module |
| (b_ModulNbr). | | (b_ModulNbr). |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
BYTE b_Type; data[0] unsigned char b_Type; data[0]
APCI1710_PULSEENCODER_WRITE APCI1710_PULSEENCODER_WRITE
Writes a 32-bit value (ul_WriteValue) into the selected| Writes a 32-bit value (ul_WriteValue) into the selected|
| pulse encoder (b_PulseEncoderNbr) from selected module | | pulse encoder (b_PulseEncoderNbr) from selected module |
| (b_ModulNbr). This operation set the new start pulse | | (b_ModulNbr). This operation set the new start pulse |
| encoder value. | encoder value.
APCI1710_PULSEENCODER_READ APCI1710_PULSEENCODER_READ
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710| | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710|
| CRAREF() BYTE_ b_ModulNbr : Module number to | | CRAREF() unsigned char_ b_ModulNbr : Module number to |
| configure (0 to 3) | | configure (0 to 3) |
| data[1] BYTE_ b_PulseEncoderNbr : Pulse encoder selection | | data[1] unsigned char_ b_PulseEncoderNbr : Pulse encoder selection |
| (0 to 3) | (0 to 3)
APCI1710_PULSEENCODER_WRITE APCI1710_PULSEENCODER_WRITE
data[2] ULONG_ ul_WriteValue : 32-bit value to be | data[2] ULONG_ ul_WriteValue : 32-bit value to be |
| written | | written |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PBYTE_ pb_Status : Pulse encoder status. | | Output Parameters : unsigned char *_ pb_Status : Pulse encoder status. |
| 0 : No overflow occur| | 0 : No overflow occur|
| 1 : Overflow occur | 1 : Overflow occur
PULONG_ pul_ReadValue : Pulse encoder value | | PULONG_ pul_ReadValue : Pulse encoder value | |
@ -702,29 +702,29 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
/*_INT_ i_APCI1710_ReadPulseEncoderStatus (BYTE_ b_BoardHandle, /*_INT_ i_APCI1710_ReadPulseEncoderStatus (unsigned char_ b_BoardHandle,
BYTE_ b_ModulNbr, unsigned char_ b_ModulNbr,
BYTE_ b_PulseEncoderNbr, unsigned char_ b_PulseEncoderNbr,
PBYTE_ pb_Status) unsigned char *_ pb_Status)
*/ */
INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev, INT i_APCI1710_InsnBitsReadWritePulseEncoder(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)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_StatusRegister; DWORD dw_StatusRegister;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_PulseEncoderNbr; unsigned char b_PulseEncoderNbr;
PBYTE pb_Status; unsigned char * pb_Status;
BYTE b_Type; unsigned char b_Type;
PULONG pul_ReadValue; PULONG pul_ReadValue;
ULONG ul_WriteValue; ULONG ul_WriteValue;
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_Type = (BYTE) data[0]; b_Type = (unsigned char) data[0];
b_PulseEncoderNbr = (BYTE) data[1]; b_PulseEncoderNbr = (unsigned char) data[1];
pb_Status = (PBYTE) & data[0]; pb_Status = (unsigned char *) & data[0];
pul_ReadValue = (PULONG) & data[1]; pul_ReadValue = (PULONG) & data[1];
/***********************************/ /***********************************/
@ -766,7 +766,7 @@ INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev,
dw_StatusRegister; dw_StatusRegister;
*pb_Status = *pb_Status =
(BYTE) (devpriv-> (unsigned char) (devpriv->
s_ModuleInfo[b_ModulNbr]. s_ModuleInfo[b_ModulNbr].
s_PulseEncoderModuleInfo. s_PulseEncoderModuleInfo.
dw_StatusRegister >> (1 + dw_StatusRegister >> (1 +

270
drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c
View file

@ -73,16 +73,16 @@ struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)
INT i_APCI1710_InsnConfigPWM(struct comedi_device * dev, struct comedi_subdevice * s, INT i_APCI1710_InsnConfigPWM(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_insn * insn, unsigned int * data) struct comedi_insn * insn, unsigned int * data)
{ {
BYTE b_ConfigType; unsigned char b_ConfigType;
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
b_ConfigType = CR_CHAN(insn->chanspec); b_ConfigType = CR_CHAN(insn->chanspec);
switch (b_ConfigType) { switch (b_ConfigType) {
case APCI1710_PWM_INIT: case APCI1710_PWM_INIT:
i_ReturnValue = i_APCI1710_InitPWM(dev, (BYTE) CR_AREF(insn->chanspec), // b_ModulNbr i_ReturnValue = i_APCI1710_InitPWM(dev, (unsigned char) CR_AREF(insn->chanspec), // b_ModulNbr
(BYTE) data[0], //b_PWM (unsigned char) data[0], //b_PWM
(BYTE) data[1], // b_ClockSelection (unsigned char) data[1], // b_ClockSelection
(BYTE) data[2], // b_TimingUnit (unsigned char) data[2], // b_TimingUnit
(ULONG) data[3], //ul_LowTiming (ULONG) data[3], //ul_LowTiming
(ULONG) data[4], //ul_HighTiming (ULONG) data[4], //ul_HighTiming
(PULONG) & data[0], //pul_RealLowTiming (PULONG) & data[0], //pul_RealLowTiming
@ -91,17 +91,17 @@ INT i_APCI1710_InsnConfigPWM(struct comedi_device * dev, struct comedi_subdevice
break; break;
case APCI1710_PWM_GETINITDATA: case APCI1710_PWM_GETINITDATA:
i_ReturnValue = i_APCI1710_GetPWMInitialisation(dev, (BYTE) CR_AREF(insn->chanspec), // b_ModulNbr i_ReturnValue = i_APCI1710_GetPWMInitialisation(dev, (unsigned char) CR_AREF(insn->chanspec), // b_ModulNbr
(BYTE) data[0], //b_PWM (unsigned char) data[0], //b_PWM
(PBYTE) & data[0], //pb_TimingUnit (unsigned char *) & data[0], //pb_TimingUnit
(PULONG) & data[1], //pul_LowTiming (PULONG) & data[1], //pul_LowTiming
(PULONG) & data[2], //pul_HighTiming (PULONG) & data[2], //pul_HighTiming
(PBYTE) & data[3], // pb_StartLevel (unsigned char *) & data[3], // pb_StartLevel
(PBYTE) & data[4], // pb_StopMode (unsigned char *) & data[4], // pb_StopMode
(PBYTE) & data[5], // pb_StopLevel (unsigned char *) & data[5], // pb_StopLevel
(PBYTE) & data[6], // pb_ExternGate (unsigned char *) & data[6], // pb_ExternGate
(PBYTE) & data[7], // pb_InterruptEnable (unsigned char *) & data[7], // pb_InterruptEnable
(PBYTE) & data[8] // pb_Enable (unsigned char *) & data[8] // pb_Enable
); );
break; break;
@ -117,11 +117,11 @@ INT i_APCI1710_InsnConfigPWM(struct comedi_device * dev, struct comedi_subdevice
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_InitPWM | | Function Name : _INT_ i_APCI1710_InitPWM |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_PWM, | | unsigned char_ b_PWM, |
| BYTE_ b_ClockSelection, | | unsigned char_ b_ClockSelection, |
| BYTE_ b_TimingUnit, | | unsigned char_ b_TimingUnit, |
| ULONG_ ul_LowTiming, | | ULONG_ ul_LowTiming, |
| ULONG_ ul_HighTiming, | | ULONG_ ul_HighTiming, |
| PULONG_ pul_RealLowTiming, | | PULONG_ pul_RealLowTiming, |
@ -135,11 +135,11 @@ INT i_APCI1710_InsnConfigPWM(struct comedi_device * dev, struct comedi_subdevice
| You must calling this function be for you call any | | You must calling this function be for you call any |
| other function witch access of the PWM. | | other function witch access of the PWM. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Module number to configure| | unsigned char_ b_ModulNbr : Module number to configure|
| (0 to 3) | | (0 to 3) |
| BYTE_ b_PWM : Selected PWM (0 or 1). | | unsigned char_ b_PWM : Selected PWM (0 or 1). |
| BYTE_ b_ClockSelection : Selection from PCI bus | | unsigned char_ b_ClockSelection : Selection from PCI bus |
| clock | | clock |
| - APCI1710_30MHZ : | | - APCI1710_30MHZ : |
| The PC have a 30 MHz | | The PC have a 30 MHz |
@ -151,7 +151,7 @@ INT i_APCI1710_InsnConfigPWM(struct comedi_device * dev, struct comedi_subdevice
| The APCI-1710 have a | | The APCI-1710 have a |
| integrated 40Mhz | | integrated 40Mhz |
| quartz. | | quartz. |
| BYTE_ b_TimingUnit : Base timing Unit (0 to 4) | | unsigned char_ b_TimingUnit : Base timing Unit (0 to 4) |
| 0 : ns | | 0 : ns |
| 1 : æs | | 1 : æs |
| 2 : ms | | 2 : ms |
@ -180,10 +180,10 @@ INT i_APCI1710_InsnConfigPWM(struct comedi_device * dev, struct comedi_subdevice
*/ */
INT i_APCI1710_InitPWM(struct comedi_device * dev, INT i_APCI1710_InitPWM(struct comedi_device * dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_PWM, unsigned char b_PWM,
BYTE b_ClockSelection, unsigned char b_ClockSelection,
BYTE b_TimingUnit, unsigned char b_TimingUnit,
ULONG ul_LowTiming, ULONG ul_LowTiming,
ULONG ul_HighTiming, ULONG ul_HighTiming,
PULONG pul_RealLowTiming, PULONG pul_RealHighTiming) PULONG pul_RealLowTiming, PULONG pul_RealHighTiming)
@ -1442,29 +1442,29 @@ INT i_APCI1710_InitPWM(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_GetPWMInitialisation | | Function Name : _INT_ i_APCI1710_GetPWMInitialisation |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_PWM, | | unsigned char_ b_PWM, |
| PBYTE_ pb_TimingUnit, | | unsigned char *_ pb_TimingUnit, |
| PULONG_ pul_LowTiming, | | PULONG_ pul_LowTiming, |
| PULONG_ pul_HighTiming, | | PULONG_ pul_HighTiming, |
| PBYTE_ pb_StartLevel, | | unsigned char *_ pb_StartLevel, |
| PBYTE_ pb_StopMode, | | unsigned char *_ pb_StopMode, |
| PBYTE_ pb_StopLevel, | | unsigned char *_ pb_StopLevel, |
| PBYTE_ pb_ExternGate, | | unsigned char *_ pb_ExternGate, |
| PBYTE_ pb_InterruptEnable, | | unsigned char *_ pb_InterruptEnable, |
| PBYTE_ pb_Enable) | | unsigned char *_ pb_Enable) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Return the PWM (b_PWM) initialisation from selected | | Task : Return the PWM (b_PWM) initialisation from selected |
| module (b_ModulNbr). You must calling the | | module (b_ModulNbr). You must calling the |
| "i_APCI1710_InitPWM" function be for you call this | | "i_APCI1710_InitPWM" function be for you call this |
| function. | | function. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3) | | unsigned char_ b_ModulNbr : Selected module number (0 to 3) |
| BYTE_ b_PWM : Selected PWM (0 or 1) | | unsigned char_ b_PWM : Selected PWM (0 or 1) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PBYTE_ pb_TimingUnit : Base timing Unit (0 to 4) | | Output Parameters : unsigned char *_ pb_TimingUnit : Base timing Unit (0 to 4) |
| 0 : ns | | 0 : ns |
| 1 : æs | | 1 : æs |
| 2 : ms | | 2 : ms |
@ -1472,13 +1472,13 @@ INT i_APCI1710_InitPWM(struct comedi_device * dev,
| 4 : mn | | 4 : mn |
| PULONG_ pul_LowTiming : Low base timing value. | | PULONG_ pul_LowTiming : Low base timing value. |
| PULONG_ pul_HighTiming : High base timing value. | | PULONG_ pul_HighTiming : High base timing value. |
| PBYTE_ pb_StartLevel : Start period level | | unsigned char *_ pb_StartLevel : Start period level |
| selection | | selection |
| 0 : The period start | | 0 : The period start |
| with a low level | | with a low level |
| 1 : The period start | | 1 : The period start |
| with a high level| | with a high level|
| PBYTE_ pb_StopMode : Stop mode selection | | unsigned char *_ pb_StopMode : Stop mode selection |
| 0 : The PWM is stopped | | 0 : The PWM is stopped |
| directly after the | | directly after the |
| "i_APCI1710_DisablePWM"| | "i_APCI1710_DisablePWM"|
@ -1489,7 +1489,7 @@ INT i_APCI1710_InitPWM(struct comedi_device * dev,
| function the PWM is | | function the PWM is |
| stopped at the end | | stopped at the end |
| from last period cycle| | from last period cycle|
| PBYTE_ pb_StopLevel : Stop PWM level selection | | unsigned char *_ pb_StopLevel : Stop PWM level selection |
| 0 : The output signal | | 0 : The output signal |
| keep the level after| | keep the level after|
| the | | the |
@ -1504,13 +1504,13 @@ INT i_APCI1710_InitPWM(struct comedi_device * dev,
| the | | the |
| "i_APCI1710_DisablePWM"| | "i_APCI1710_DisablePWM"|
| function | | function |
| PBYTE_ pb_ExternGate : Extern gate action | | unsigned char *_ pb_ExternGate : Extern gate action |
| selection | | selection |
| 0 : Extern gate signal | | 0 : Extern gate signal |
| not used. | | not used. |
| 1 : Extern gate signal | | 1 : Extern gate signal |
| used. | | used. |
| PBYTE_ pb_InterruptEnable : Enable or disable the PWM | | unsigned char *_ pb_InterruptEnable : Enable or disable the PWM |
| interrupt. | | interrupt. |
| - APCI1710_ENABLE : | | - APCI1710_ENABLE : |
| Enable the PWM interrupt| | Enable the PWM interrupt|
@ -1519,7 +1519,7 @@ INT i_APCI1710_InitPWM(struct comedi_device * dev,
| - APCI1710_DISABLE : | | - APCI1710_DISABLE : |
| Disable the PWM | | Disable the PWM |
| interrupt | | interrupt |
| PBYTE_ pb_Enable : Indicate if the PWM is | | unsigned char *_ pb_Enable : Indicate if the PWM is |
| enabled or no | | enabled or no |
| 0 : PWM not enabled | | 0 : PWM not enabled |
| 1 : PWM enabled | | 1 : PWM enabled |
@ -1535,15 +1535,15 @@ INT i_APCI1710_InitPWM(struct comedi_device * dev,
*/ */
INT i_APCI1710_GetPWMInitialisation(struct comedi_device * dev, INT i_APCI1710_GetPWMInitialisation(struct comedi_device * dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_PWM, unsigned char b_PWM,
PBYTE pb_TimingUnit, unsigned char * pb_TimingUnit,
PULONG pul_LowTiming, PULONG pul_LowTiming,
PULONG pul_HighTiming, PULONG pul_HighTiming,
PBYTE pb_StartLevel, unsigned char * pb_StartLevel,
PBYTE pb_StopMode, unsigned char * pb_StopMode,
PBYTE pb_StopLevel, unsigned char * pb_StopLevel,
PBYTE pb_ExternGate, PBYTE pb_InterruptEnable, PBYTE pb_Enable) unsigned char * pb_ExternGate, unsigned char * pb_InterruptEnable, unsigned char * pb_Enable)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_Status; DWORD dw_Status;
@ -1602,20 +1602,20 @@ INT i_APCI1710_GetPWMInitialisation(struct comedi_device * dev,
(64 * b_ModulNbr)); (64 * b_ModulNbr));
*pb_StartLevel = *pb_StartLevel =
(BYTE) ((dw_Command >> 5) & 1); (unsigned char) ((dw_Command >> 5) & 1);
*pb_StopMode = *pb_StopMode =
(BYTE) ((dw_Command >> 0) & 1); (unsigned char) ((dw_Command >> 0) & 1);
*pb_StopLevel = *pb_StopLevel =
(BYTE) ((dw_Command >> 1) & 1); (unsigned char) ((dw_Command >> 1) & 1);
*pb_ExternGate = *pb_ExternGate =
(BYTE) ((dw_Command >> 4) & 1); (unsigned char) ((dw_Command >> 4) & 1);
*pb_InterruptEnable = *pb_InterruptEnable =
(BYTE) ((dw_Command >> 3) & 1); (unsigned char) ((dw_Command >> 3) & 1);
if (*pb_StopLevel) { if (*pb_StopLevel) {
*pb_StopLevel = *pb_StopLevel =
*pb_StopLevel + *pb_StopLevel +
(BYTE) ((dw_Command >> (unsigned char) ((dw_Command >>
2) & 1); 2) & 1);
} }
@ -1628,7 +1628,7 @@ INT i_APCI1710_GetPWMInitialisation(struct comedi_device * dev,
(64 * b_ModulNbr)); (64 * b_ModulNbr));
*pb_Enable = *pb_Enable =
(BYTE) ((dw_Command >> 0) & 1); (unsigned char) ((dw_Command >> 0) & 1);
*pb_TimingUnit = devpriv-> *pb_TimingUnit = devpriv->
s_ModuleInfo[b_ModulNbr]. s_ModuleInfo[b_ModulNbr].
@ -1686,30 +1686,30 @@ struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)
INT i_APCI1710_InsnWritePWM(struct comedi_device * dev, struct comedi_subdevice * s, INT i_APCI1710_InsnWritePWM(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_insn * insn, unsigned int * data) struct comedi_insn * insn, unsigned int * data)
{ {
BYTE b_WriteType; unsigned char b_WriteType;
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
b_WriteType = CR_CHAN(insn->chanspec); b_WriteType = CR_CHAN(insn->chanspec);
switch (b_WriteType) { switch (b_WriteType) {
case APCI1710_PWM_ENABLE: case APCI1710_PWM_ENABLE:
i_ReturnValue = i_APCI1710_EnablePWM(dev, i_ReturnValue = i_APCI1710_EnablePWM(dev,
(BYTE) CR_AREF(insn->chanspec), (unsigned char) CR_AREF(insn->chanspec),
(BYTE) data[0], (unsigned char) data[0],
(BYTE) data[1], (unsigned char) data[1],
(BYTE) data[2], (unsigned char) data[2],
(BYTE) data[3], (BYTE) data[4], (BYTE) data[5]); (unsigned char) data[3], (unsigned char) data[4], (unsigned char) data[5]);
break; break;
case APCI1710_PWM_DISABLE: case APCI1710_PWM_DISABLE:
i_ReturnValue = i_APCI1710_DisablePWM(dev, i_ReturnValue = i_APCI1710_DisablePWM(dev,
(BYTE) CR_AREF(insn->chanspec), (BYTE) data[0]); (unsigned char) CR_AREF(insn->chanspec), (unsigned char) data[0]);
break; break;
case APCI1710_PWM_NEWTIMING: case APCI1710_PWM_NEWTIMING:
i_ReturnValue = i_APCI1710_SetNewPWMTiming(dev, i_ReturnValue = i_APCI1710_SetNewPWMTiming(dev,
(BYTE) CR_AREF(insn->chanspec), (unsigned char) CR_AREF(insn->chanspec),
(BYTE) data[0], (unsigned char) data[0],
(BYTE) data[1], (ULONG) data[2], (ULONG) data[3]); (unsigned char) data[1], (ULONG) data[2], (ULONG) data[3]);
break; break;
default: default:
@ -1724,14 +1724,14 @@ INT i_APCI1710_InsnWritePWM(struct comedi_device * dev, struct comedi_subdevice
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_EnablePWM | | Function Name : _INT_ i_APCI1710_EnablePWM |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_PWM, | | unsigned char_ b_PWM, |
| BYTE_ b_StartLevel, | | unsigned char_ b_StartLevel, |
| BYTE_ b_StopMode, | | unsigned char_ b_StopMode, |
| BYTE_ b_StopLevel, | | unsigned char_ b_StopLevel, |
| BYTE_ b_ExternGate, | | unsigned char_ b_ExternGate, |
| BYTE_ b_InterruptEnable) | | unsigned char_ b_InterruptEnable) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Enable the selected PWM (b_PWM) from selected module | | Task : Enable the selected PWM (b_PWM) from selected module |
| (b_ModulNbr). You must calling the "i_APCI1710_InitPWM"| | (b_ModulNbr). You must calling the "i_APCI1710_InitPWM"|
@ -1741,16 +1741,16 @@ INT i_APCI1710_InsnWritePWM(struct comedi_device * dev, struct comedi_subdevice
| See function "i_APCI1710_SetBoardIntRoutineX" and the | | See function "i_APCI1710_SetBoardIntRoutineX" and the |
| Interrupt mask description chapter. | | Interrupt mask description chapter. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number | | unsigned char_ b_ModulNbr : Selected module number |
| (0 to 3) | | (0 to 3) |
| BYTE_ b_PWM : Selected PWM (0 or 1) | | unsigned char_ b_PWM : Selected PWM (0 or 1) |
| BYTE_ b_StartLevel : Start period level selection | | unsigned char_ b_StartLevel : Start period level selection |
| 0 : The period start with a | | 0 : The period start with a |
| low level | | low level |
| 1 : The period start with a | | 1 : The period start with a |
| high level | | high level |
| BYTE_ b_StopMode : Stop mode selection | | unsigned char_ b_StopMode : Stop mode selection |
| 0 : The PWM is stopped | | 0 : The PWM is stopped |
| directly after the | | directly after the |
| "i_APCI1710_DisablePWM" | | "i_APCI1710_DisablePWM" |
@ -1761,7 +1761,7 @@ INT i_APCI1710_InsnWritePWM(struct comedi_device * dev, struct comedi_subdevice
| function the PWM is | | function the PWM is |
| stopped at the end from| | stopped at the end from|
| last period cycle. | | last period cycle. |
| BYTE_ b_StopLevel : Stop PWM level selection | | unsigned char_ b_StopLevel : Stop PWM level selection |
| 0 : The output signal keep | | 0 : The output signal keep |
| the level after the | | the level after the |
| "i_APCI1710_DisablePWM" | | "i_APCI1710_DisablePWM" |
@ -1774,11 +1774,11 @@ INT i_APCI1710_InsnWritePWM(struct comedi_device * dev, struct comedi_subdevice
| to high after the | | to high after the |
| "i_APCI1710_DisablePWM" | | "i_APCI1710_DisablePWM" |
| function | | function |
| BYTE_ b_ExternGate : Extern gate action selection | | unsigned char_ b_ExternGate : Extern gate action selection |
| 0 : Extern gate signal not | | 0 : Extern gate signal not |
| used. | | used. |
| 1 : Extern gate signal used.| | 1 : Extern gate signal used.|
| BYTE_ b_InterruptEnable : Enable or disable the PWM | | unsigned char_ b_InterruptEnable : Enable or disable the PWM |
| interrupt. | | interrupt. |
| - APCI1710_ENABLE : | | - APCI1710_ENABLE : |
| Enable the PWM interrupt | | Enable the PWM interrupt |
@ -1807,11 +1807,11 @@ INT i_APCI1710_InsnWritePWM(struct comedi_device * dev, struct comedi_subdevice
*/ */
INT i_APCI1710_EnablePWM(struct comedi_device * dev, INT i_APCI1710_EnablePWM(struct comedi_device * dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_PWM, unsigned char b_PWM,
BYTE b_StartLevel, unsigned char b_StartLevel,
BYTE b_StopMode, unsigned char b_StopMode,
BYTE b_StopLevel, BYTE b_ExternGate, BYTE b_InterruptEnable) unsigned char b_StopLevel, unsigned char b_ExternGate, unsigned char b_InterruptEnable)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_Status; DWORD dw_Status;
@ -2034,9 +2034,9 @@ INT i_APCI1710_EnablePWM(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_DisablePWM (BYTE_ b_BoardHandle, | | Function Name : _INT_ i_APCI1710_DisablePWM (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_PWM) | | unsigned char_ b_PWM) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Disable the selected PWM (b_PWM) from selected module | | Task : Disable the selected PWM (b_PWM) from selected module |
| (b_ModulNbr). The output signal level depend of the | | (b_ModulNbr). The output signal level depend of the |
@ -2045,8 +2045,8 @@ INT i_APCI1710_EnablePWM(struct comedi_device * dev,
| parameters from this function. | | parameters from this function. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters :BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters :BYTE_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3) | | unsigned char_ b_ModulNbr : Selected module number (0 to 3) |
| BYTE_ b_PWM : Selected PWM (0 or 1) | | unsigned char_ b_PWM : Selected PWM (0 or 1) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2062,7 +2062,7 @@ INT i_APCI1710_EnablePWM(struct comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_DisablePWM(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_PWM) INT i_APCI1710_DisablePWM(struct comedi_device * dev, unsigned char b_ModulNbr, unsigned char b_PWM)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_Status; DWORD dw_Status;
@ -2150,11 +2150,11 @@ INT i_APCI1710_DisablePWM(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_PW
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_SetNewPWMTiming | | Function Name : _INT_ i_APCI1710_SetNewPWMTiming |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_PWM, | | unsigned char_ b_PWM, |
| BYTE_ b_ClockSelection, | | unsigned char_ b_ClockSelection, |
| BYTE_ b_TimingUnit, | | unsigned char_ b_TimingUnit, |
| ULONG_ ul_LowTiming, | | ULONG_ ul_LowTiming, |
| ULONG_ ul_HighTiming) | | ULONG_ ul_HighTiming) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2162,11 +2162,11 @@ INT i_APCI1710_DisablePWM(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_PW
| ul_TimingUnit determine the low/high timing base for | | ul_TimingUnit determine the low/high timing base for |
| the period. | | the period. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Module number to configure| | unsigned char_ b_ModulNbr : Module number to configure|
| (0 to 3) | | (0 to 3) |
| BYTE_ b_PWM : Selected PWM (0 or 1). | | unsigned char_ b_PWM : Selected PWM (0 or 1). |
| BYTE_ b_TimingUnit : Base timing Unit (0 to 4) | | unsigned char_ b_TimingUnit : Base timing Unit (0 to 4) |
| 0 : ns | | 0 : ns |
| 1 : æs | | 1 : æs |
| 2 : ms | | 2 : ms |
@ -2190,10 +2190,10 @@ INT i_APCI1710_DisablePWM(struct comedi_device * dev, BYTE b_ModulNbr, BYTE b_PW
*/ */
INT i_APCI1710_SetNewPWMTiming(struct comedi_device * dev, INT i_APCI1710_SetNewPWMTiming(struct comedi_device * dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_PWM, BYTE b_TimingUnit, ULONG ul_LowTiming, ULONG ul_HighTiming) unsigned char b_PWM, unsigned char b_TimingUnit, ULONG ul_LowTiming, ULONG ul_HighTiming)
{ {
BYTE b_ClockSelection; unsigned char b_ClockSelection;
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
ULONG ul_LowTimerValue = 0; ULONG ul_LowTimerValue = 0;
ULONG ul_HighTimerValue = 0; ULONG ul_HighTimerValue = 0;
@ -3417,37 +3417,37 @@ INT i_APCI1710_SetNewPWMTiming(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_GetPWMStatus | | Function Name : _INT_ i_APCI1710_GetPWMStatus |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_PWM, | | unsigned char_ b_PWM, |
| PBYTE_ pb_PWMOutputStatus, | | unsigned char *_ pb_PWMOutputStatus, |
| PBYTE_ pb_ExternGateStatus) | | unsigned char *_ pb_ExternGateStatus) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Return the status from selected PWM (b_PWM) from | | Task : Return the status from selected PWM (b_PWM) from |
| selected module (b_ModulNbr). | | selected module (b_ModulNbr). |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_PWM : Selected PWM (0 or 1) | | unsigned char_ b_PWM : Selected PWM (0 or 1) |
| BYTE_ b_ModulNbr : Selected module number (0 to 3) | unsigned char_ b_ModulNbr : Selected module number (0 to 3)
b_ModulNbr =(BYTE) CR_AREF(insn->chanspec); b_ModulNbr =(unsigned char) CR_AREF(insn->chanspec);
b_PWM =(BYTE) data[0]; b_PWM =(unsigned char) data[0];
| |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PBYTE_ pb_PWMOutputStatus : Return the PWM output | | Output Parameters : unsigned char *_ pb_PWMOutputStatus : Return the PWM output |
| level status. | | level status. |
| 0 : The PWM output level| | 0 : The PWM output level|
| is low. | | is low. |
| 1 : The PWM output level| | 1 : The PWM output level|
| is high. | | is high. |
| PBYTE_ pb_ExternGateStatus : Return the extern gate | | unsigned char *_ pb_ExternGateStatus : Return the extern gate |
| level status. | | level status. |
| 0 : The extern gate is | | 0 : The extern gate is |
| low. | | low. |
| 1 : The extern gate is | | 1 : The extern gate is |
| high. | high.
pb_PWMOutputStatus =(PBYTE) data[0]; pb_PWMOutputStatus =(unsigned char *) data[0];
pb_ExternGateStatus =(PBYTE) data[1]; | pb_ExternGateStatus =(unsigned char *) data[1]; |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Return Value : 0: No error | | Return Value : 0: No error |
| -1: The handle parameter of the board is wrong | | -1: The handle parameter of the board is wrong |
@ -3466,16 +3466,16 @@ INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device * dev, struct comedi_su
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_Status; DWORD dw_Status;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_PWM; unsigned char b_PWM;
PBYTE pb_PWMOutputStatus; unsigned char * pb_PWMOutputStatus;
PBYTE pb_ExternGateStatus; unsigned char * pb_ExternGateStatus;
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_PWM = (BYTE) CR_CHAN(insn->chanspec); b_PWM = (unsigned char) CR_CHAN(insn->chanspec);
pb_PWMOutputStatus = (PBYTE) & data[0]; pb_PWMOutputStatus = (unsigned char *) & data[0];
pb_ExternGateStatus = (PBYTE) & data[1]; pb_ExternGateStatus = (unsigned char *) & data[1];
/**************************/ /**************************/
/* Test the module number */ /* Test the module number */
@ -3509,10 +3509,10 @@ INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device * dev, struct comedi_su
if (dw_Status & 0x1) { if (dw_Status & 0x1) {
*pb_PWMOutputStatus = *pb_PWMOutputStatus =
(BYTE) ((dw_Status >> 7) (unsigned char) ((dw_Status >> 7)
& 1); & 1);
*pb_ExternGateStatus = *pb_ExternGateStatus =
(BYTE) ((dw_Status >> 6) (unsigned char) ((dw_Status >> 6)
& 1); & 1);
} // if (dw_Status & 0x1) } // if (dw_Status & 0x1)
else { else {

42
drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
View file

@ -30,43 +30,43 @@ INT i_APCI1710_InsnConfigPWM(struct comedi_device *dev, struct comedi_subdevice
struct comedi_insn *insn, unsigned int *data); struct comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InitPWM(struct comedi_device *dev, INT i_APCI1710_InitPWM(struct comedi_device *dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_PWM, unsigned char b_PWM,
BYTE b_ClockSelection, unsigned char b_ClockSelection,
BYTE b_TimingUnit, unsigned char b_TimingUnit,
ULONG ul_LowTiming, ULONG ul_LowTiming,
ULONG ul_HighTiming, ULONG ul_HighTiming,
PULONG pul_RealLowTiming, PULONG pul_RealHighTiming); PULONG pul_RealLowTiming, PULONG pul_RealHighTiming);
INT i_APCI1710_GetPWMInitialisation(struct comedi_device *dev, INT i_APCI1710_GetPWMInitialisation(struct comedi_device *dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_PWM, unsigned char b_PWM,
PBYTE pb_TimingUnit, unsigned char * pb_TimingUnit,
PULONG pul_LowTiming, PULONG pul_LowTiming,
PULONG pul_HighTiming, PULONG pul_HighTiming,
PBYTE pb_StartLevel, unsigned char * pb_StartLevel,
PBYTE pb_StopMode, unsigned char * pb_StopMode,
PBYTE pb_StopLevel, unsigned char * pb_StopLevel,
PBYTE pb_ExternGate, unsigned char * pb_ExternGate,
PBYTE pb_InterruptEnable, PBYTE pb_Enable); unsigned char * pb_InterruptEnable, unsigned char * pb_Enable);
INT i_APCI1710_InsnWritePWM(struct comedi_device *dev, struct comedi_subdevice *s, INT i_APCI1710_InsnWritePWM(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data); struct comedi_insn *insn, unsigned int *data);
INT i_APCI1710_EnablePWM(struct comedi_device *dev, INT i_APCI1710_EnablePWM(struct comedi_device *dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_PWM, unsigned char b_PWM,
BYTE b_StartLevel, unsigned char b_StartLevel,
BYTE b_StopMode, unsigned char b_StopMode,
BYTE b_StopLevel, BYTE b_ExternGate, unsigned char b_StopLevel, unsigned char b_ExternGate,
BYTE b_InterruptEnable); unsigned char b_InterruptEnable);
INT i_APCI1710_SetNewPWMTiming(struct comedi_device *dev, INT i_APCI1710_SetNewPWMTiming(struct comedi_device *dev,
BYTE b_ModulNbr, unsigned char b_ModulNbr,
BYTE b_PWM, BYTE b_TimingUnit, unsigned char b_PWM, unsigned char b_TimingUnit,
ULONG ul_LowTiming, ULONG ul_HighTiming); ULONG ul_LowTiming, ULONG ul_HighTiming);
INT i_APCI1710_DisablePWM(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_PWM); INT i_APCI1710_DisablePWM(struct comedi_device *dev, unsigned char b_ModulNbr, unsigned char b_PWM);
INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, struct comedi_subdevice *s, INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data); struct comedi_insn *insn, unsigned int *data);

128
drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
View file

@ -65,31 +65,31 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_InitSSI | | Function Name : _INT_ i_APCI1710_InitSSI |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_SSIProfile, | | unsigned char_ b_SSIProfile, |
| BYTE_ b_PositionTurnLength, | | unsigned char_ b_PositionTurnLength, |
| BYTE_ b_TurnCptLength, | | unsigned char_ b_TurnCptLength, |
| BYTE_ b_PCIInputClock, | | unsigned char_ b_PCIInputClock, |
| ULONG_ ul_SSIOutputClock, | | ULONG_ ul_SSIOutputClock, |
| BYTE_ b_SSICountingMode) | | unsigned char_ b_SSICountingMode) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configure the SSI operating mode from selected module | | Task : Configure the SSI operating mode from selected module |
| (b_ModulNbr). You must calling this function be for you| | (b_ModulNbr). You must calling this function be for you|
| call any other function witch access of SSI. | | call any other function witch access of SSI. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710| | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710|
| BYTE_ b_ModulNbr : Module number to | | unsigned char_ b_ModulNbr : Module number to |
| configure (0 to 3) | | configure (0 to 3) |
| BYTE_ b_SSIProfile : Selection from SSI | | unsigned char_ b_SSIProfile : Selection from SSI |
| profile length (2 to 32).| | profile length (2 to 32).|
| BYTE_ b_PositionTurnLength : Selection from SSI | | unsigned char_ b_PositionTurnLength : Selection from SSI |
| position data length | | position data length |
| (1 to 31). | | (1 to 31). |
| BYTE_ b_TurnCptLength : Selection from SSI turn | | unsigned char_ b_TurnCptLength : Selection from SSI turn |
| counter data length | | counter data length |
| (1 to 31). | | (1 to 31). |
| BYTE b_PCIInputClock : Selection from PCI bus | | unsigned char b_PCIInputClock : Selection from PCI bus |
| clock | | clock |
| - APCI1710_30MHZ : | | - APCI1710_30MHZ : |
| The PC have a PCI bus | | The PC have a PCI bus |
@ -103,7 +103,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| for 30 MHz selection. | | for 30 MHz selection. |
| From 252 to 5 000 000 Hz| | From 252 to 5 000 000 Hz|
| for 33 MHz selection. | | for 33 MHz selection. |
| BYTE b_SSICountingMode : SSI counting mode | | unsigned char b_SSICountingMode : SSI counting mode |
| selection | | selection |
| - APCI1710_BINARY_MODE : | | - APCI1710_BINARY_MODE : |
| Binary counting mode. | | Binary counting mode. |
@ -111,12 +111,12 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| Gray counting mode. | Gray counting mode.
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_SSIProfile = (BYTE) data[0]; b_SSIProfile = (unsigned char) data[0];
b_PositionTurnLength= (BYTE) data[1]; b_PositionTurnLength= (unsigned char) data[1];
b_TurnCptLength = (BYTE) data[2]; b_TurnCptLength = (unsigned char) data[2];
b_PCIInputClock = (BYTE) data[3]; b_PCIInputClock = (unsigned char) data[3];
ul_SSIOutputClock = (ULONG) data[4]; ul_SSIOutputClock = (ULONG) data[4];
b_SSICountingMode = (BYTE) data[5]; | b_SSICountingMode = (unsigned char) data[5]; |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -138,17 +138,17 @@ INT i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, struct comedi_subde
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
UINT ui_TimerValue; UINT ui_TimerValue;
BYTE b_ModulNbr, b_SSIProfile, b_PositionTurnLength, b_TurnCptLength, unsigned char b_ModulNbr, b_SSIProfile, b_PositionTurnLength, b_TurnCptLength,
b_PCIInputClock, b_SSICountingMode; b_PCIInputClock, b_SSICountingMode;
ULONG ul_SSIOutputClock; ULONG ul_SSIOutputClock;
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_SSIProfile = (BYTE) data[0]; b_SSIProfile = (unsigned char) data[0];
b_PositionTurnLength = (BYTE) data[1]; b_PositionTurnLength = (unsigned char) data[1];
b_TurnCptLength = (BYTE) data[2]; b_TurnCptLength = (unsigned char) data[2];
b_PCIInputClock = (BYTE) data[3]; b_PCIInputClock = (unsigned char) data[3];
ul_SSIOutputClock = (ULONG) data[4]; ul_SSIOutputClock = (ULONG) data[4];
b_SSICountingMode = (BYTE) data[5]; b_SSICountingMode = (unsigned char) data[5];
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
/**************************/ /**************************/
@ -357,9 +357,9 @@ INT i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, struct comedi_subde
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_Read1SSIValue | | Function Name : _INT_ i_APCI1710_Read1SSIValue |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_SelectedSSI, | | unsigned char_ b_SelectedSSI, |
| PULONG_ pul_Position, | | PULONG_ pul_Position, |
| PULONG_ pul_TurnCpt) | PULONG_ pul_TurnCpt)
INT i_APCI1710_ReadSSIValue(struct comedi_device *dev,struct comedi_subdevice *s, INT i_APCI1710_ReadSSIValue(struct comedi_device *dev,struct comedi_subdevice *s,
@ -373,15 +373,15 @@ INT i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, struct comedi_subde
or Read all SSI counter (b_SelectedSSI) from | or Read all SSI counter (b_SelectedSSI) from |
| selected module (b_ModulNbr). | | selected module (b_ModulNbr). |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710| | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710|
| BYTE_ b_ModulNbr : Module number to | | unsigned char_ b_ModulNbr : Module number to |
| configure (0 to 3) | | configure (0 to 3) |
| BYTE_ b_SelectedSSI : Selection from SSI | | unsigned char_ b_SelectedSSI : Selection from SSI |
| counter (0 to 2) | counter (0 to 2)
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_SelectedSSI = (BYTE) CR_CHAN(insn->chanspec); (in case of single ssi) b_SelectedSSI = (unsigned char) CR_CHAN(insn->chanspec); (in case of single ssi)
b_ReadType = (BYTE) CR_RANGE(insn->chanspec); b_ReadType = (unsigned char) CR_RANGE(insn->chanspec);
| |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PULONG_ pul_Position : SSI position in the turn | | Output Parameters : PULONG_ pul_Position : SSI position in the turn |
@ -404,18 +404,18 @@ INT i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, struct comedi_subdev
struct comedi_insn * insn, unsigned int * data) struct comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
BYTE b_Cpt; unsigned char b_Cpt;
BYTE b_Length; unsigned char b_Length;
BYTE b_Schift; unsigned char b_Schift;
BYTE b_SSICpt; unsigned char b_SSICpt;
DWORD dw_And; DWORD dw_And;
DWORD dw_And1; DWORD dw_And1;
DWORD dw_And2; DWORD dw_And2;
DWORD dw_StatusReg; DWORD dw_StatusReg;
DWORD dw_CounterValue; DWORD dw_CounterValue;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_SelectedSSI; unsigned char b_SelectedSSI;
BYTE b_ReadType; unsigned char b_ReadType;
PULONG pul_Position; PULONG pul_Position;
PULONG pul_TurnCpt; PULONG pul_TurnCpt;
PULONG pul_Position1; PULONG pul_Position1;
@ -428,9 +428,9 @@ INT i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, struct comedi_subdev
// For Read all // For Read all
pul_Position = (PULONG) & data[0]; //0-2 pul_Position = (PULONG) & data[0]; //0-2
pul_TurnCpt = (PULONG) & data[3]; //3-5 pul_TurnCpt = (PULONG) & data[3]; //3-5
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_SelectedSSI = (BYTE) CR_CHAN(insn->chanspec); b_SelectedSSI = (unsigned char) CR_CHAN(insn->chanspec);
b_ReadType = (BYTE) CR_RANGE(insn->chanspec); b_ReadType = (unsigned char) CR_RANGE(insn->chanspec);
/**************************/ /**************************/
/* Test the module number */ /* Test the module number */
@ -701,10 +701,10 @@ INT i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, struct comedi_subdev
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_ReadSSI1DigitalInput | | Function Name : _INT_ i_APCI1710_ReadSSI1DigitalInput |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_InputChannel, | | unsigned char_ b_InputChannel, |
| PBYTE_ pb_ChannelStatus) | | unsigned char *_ pb_ChannelStatus) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : | Task :
(0) Set the digital output from selected SSI moule | (0) Set the digital output from selected SSI moule |
@ -716,13 +716,13 @@ INT i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, struct comedi_subdev
(3)Read the status from all SSI digital inputs from | (3)Read the status from all SSI digital inputs from |
| selected SSI module (b_ModulNbr) | | selected SSI module (b_ModulNbr) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710| | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710|
| BYTE_ b_ModulNbr CR_AREF : Module number to | | unsigned char_ b_ModulNbr CR_AREF : Module number to |
| configure (0 to 3) | | configure (0 to 3) |
| BYTE_ b_InputChannel CR_CHAN : Selection from digital | | unsigned char_ b_InputChannel CR_CHAN : Selection from digital |
| data[0] which IOTYPE input ( 0 to 2) | | data[0] which IOTYPE input ( 0 to 2) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PBYTE_ pb_ChannelStatus : Digital input channel | | Output Parameters : unsigned char *_ pb_ChannelStatus : Digital input channel |
| data[0] status | | data[0] status |
| 0 : Channle is not active| | 0 : Channle is not active|
| 1 : Channle is active | | 1 : Channle is active |
@ -740,14 +740,14 @@ INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device * dev, struct comedi_su
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_StatusReg; DWORD dw_StatusReg;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_InputChannel; unsigned char b_InputChannel;
PBYTE pb_ChannelStatus; unsigned char * pb_ChannelStatus;
PBYTE pb_InputStatus; unsigned char * pb_InputStatus;
BYTE b_IOType; unsigned char b_IOType;
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_IOType = (BYTE) data[0]; b_IOType = (unsigned char) data[0];
/**************************/ /**************************/
/* Test the module number */ /* Test the module number */
@ -785,8 +785,8 @@ INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device * dev, struct comedi_su
/* Test the digital imnput channel number */ /* Test the digital imnput channel number */
/******************************************/ /******************************************/
b_InputChannel = (BYTE) CR_CHAN(insn->chanspec); b_InputChannel = (unsigned char) CR_CHAN(insn->chanspec);
pb_ChannelStatus = (PBYTE) & data[0]; pb_ChannelStatus = (unsigned char *) & data[0];
if (b_InputChannel <= 2) { if (b_InputChannel <= 2) {
/**************************/ /**************************/
@ -797,7 +797,7 @@ INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device * dev, struct comedi_su
inl(devpriv->s_BoardInfos. inl(devpriv->s_BoardInfos.
ui_Address + (64 * b_ModulNbr)); ui_Address + (64 * b_ModulNbr));
*pb_ChannelStatus = *pb_ChannelStatus =
(BYTE) (((~dw_StatusReg) >> (4 + (unsigned char) (((~dw_StatusReg) >> (4 +
b_InputChannel)) b_InputChannel))
& 1); & 1);
} else { } else {
@ -814,13 +814,13 @@ INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device * dev, struct comedi_su
/**************************/ /**************************/
/* Read all digital input */ /* Read all digital input */
/**************************/ /**************************/
pb_InputStatus = (PBYTE) & data[0]; pb_InputStatus = (unsigned char *) & data[0];
dw_StatusReg = dw_StatusReg =
inl(devpriv->s_BoardInfos.ui_Address + inl(devpriv->s_BoardInfos.ui_Address +
(64 * b_ModulNbr)); (64 * b_ModulNbr));
*pb_InputStatus = *pb_InputStatus =
(BYTE) (((~dw_StatusReg) >> 4) & 7); (unsigned char) (((~dw_StatusReg) >> 4) & 7);
break; break;
default: default:

220
drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
View file

@ -63,11 +63,11 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_InitTorCounter | | Function Name : _INT_ i_APCI1710_InitTorCounter |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_TorCounter, | | unsigned char_ b_TorCounter, |
| BYTE_ b_PCIInputClock, | | unsigned char_ b_PCIInputClock, |
| BYTE_ b_TimingUnit, | | unsigned char_ b_TimingUnit, |
| ULONG_ ul_TimingInterval, | | ULONG_ ul_TimingInterval, |
| PULONG_ pul_RealTimingInterval) | | PULONG_ pul_RealTimingInterval) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -82,11 +82,11 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : | | Input Parameters : |
| |
CR_AREF BYTE_ b_ModulNbr : Module number to configure | CR_AREF unsigned char_ b_ModulNbr : Module number to configure |
| (0 to 3) | | (0 to 3) |
| data[0] BYTE_ b_TorCounter : Tor counter selection | | data[0] unsigned char_ b_TorCounter : Tor counter selection |
| (0 or 1). | | (0 or 1). |
| data[1] BYTE_ b_PCIInputClock : Selection from PCI bus clock| | data[1] unsigned char_ b_PCIInputClock : Selection from PCI bus clock|
| - APCI1710_30MHZ : | | - APCI1710_30MHZ : |
| The PC have a PCI bus | | The PC have a PCI bus |
| clock from 30 MHz | | clock from 30 MHz |
@ -104,7 +104,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| than it is not possibl to | | than it is not possibl to |
| used the gate input for | | used the gate input for |
| enabled the acquisition | | enabled the acquisition |
| data[2] BYTE_ b_TimingUnit : Base timing unit (0 to 4) | | data[2] unsigned char_ b_TimingUnit : Base timing unit (0 to 4) |
| 0 : ns | | 0 : ns |
| 1 : µs | | 1 : µs |
| 2 : ms | | 2 : ms |
@ -137,19 +137,19 @@ INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev,
ULONG ul_TimerValue = 0; ULONG ul_TimerValue = 0;
DWORD dw_Command; DWORD dw_Command;
double d_RealTimingInterval = 0; double d_RealTimingInterval = 0;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_TorCounter; unsigned char b_TorCounter;
BYTE b_PCIInputClock; unsigned char b_PCIInputClock;
BYTE b_TimingUnit; unsigned char b_TimingUnit;
ULONG ul_TimingInterval; ULONG ul_TimingInterval;
ULONG ul_RealTimingInterval = 0; ULONG ul_RealTimingInterval = 0;
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_TorCounter = (BYTE) data[0]; b_TorCounter = (unsigned char) data[0];
b_PCIInputClock = (BYTE) data[1]; b_PCIInputClock = (unsigned char) data[1];
b_TimingUnit = (BYTE) data[2]; b_TimingUnit = (unsigned char) data[2];
ul_TimingInterval = (ULONG) data[3]; ul_TimingInterval = (ULONG) data[3];
printk("INPUT clock %d\n", b_PCIInputClock); printk("INPUT clock %d\n", b_PCIInputClock);
@ -864,13 +864,13 @@ INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_EnableTorCounter | | Function Name : _INT_ i_APCI1710_EnableTorCounter |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_TorCounter, | | unsigned char_ b_TorCounter, |
| BYTE_ b_InputMode, | | unsigned char_ b_InputMode, |
| BYTE_ b_ExternGate, | | unsigned char_ b_ExternGate, |
| BYTE_ b_CycleMode, | | unsigned char_ b_CycleMode, |
| BYTE_ b_InterruptEnable) | | unsigned char_ b_InterruptEnable) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Enable the tor counter (b_TorCounter) from selected | | Task : Enable the tor counter (b_TorCounter) from selected |
| module (b_ModulNbr). You must calling the | | module (b_ModulNbr). You must calling the |
@ -883,13 +883,13 @@ INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev,
| The b_CycleMode parameter determine if you will | | The b_CycleMode parameter determine if you will |
| measured a single or more cycle. | | measured a single or more cycle. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3) | | unsigned char_ b_ModulNbr : Selected module number (0 to 3) |
| BYTE_ b_TorCounter : Tor counter selection (0 or 1). | | unsigned char_ b_TorCounter : Tor counter selection (0 or 1). |
| BYTE_ b_InputMode : Input signal level selection | | unsigned char_ b_InputMode : Input signal level selection |
| 0 : Tor count each low level | | 0 : Tor count each low level |
| 1 : Tor count each high level| | 1 : Tor count each high level|
| BYTE_ b_ExternGate : Extern gate action selection | | unsigned char_ b_ExternGate : Extern gate action selection |
| 0 : Extern gate signal not | | 0 : Extern gate signal not |
| used | | used |
| 1 : Extern gate signal used. | | 1 : Extern gate signal used. |
@ -928,9 +928,9 @@ INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev,
| The gate input is used for the | | The gate input is used for the |
| signal B | | signal B |
| | | |
| BYTE_ b_CycleMode : Selected the tor counter | | unsigned char_ b_CycleMode : Selected the tor counter |
| acquisition mode | | acquisition mode |
| BYTE_ b_InterruptEnable : Enable or disable the | | unsigned char_ b_InterruptEnable : Enable or disable the |
| tor counter interrupt. | | tor counter interrupt. |
| APCI1710_ENABLE: | | APCI1710_ENABLE: |
| Enable the tor counter | | Enable the tor counter |
@ -959,9 +959,9 @@ INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_DisableTorCounter | | Function Name : _INT_ i_APCI1710_DisableTorCounter |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_TorCounter) | | unsigned char_ b_TorCounter) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Disable the tor counter (b_TorCounter) from selected | | Task : Disable the tor counter (b_TorCounter) from selected |
| module (b_ModulNbr). If you disable the tor counter | | module (b_ModulNbr). If you disable the tor counter |
@ -969,9 +969,9 @@ INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev,
| counter witch the " i_APCI1710_EnableTorCounter" | | counter witch the " i_APCI1710_EnableTorCounter" |
| function, the status register is cleared | | function, the status register is cleared |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3) | | unsigned char_ b_ModulNbr : Selected module number (0 to 3) |
| BYTE_ b_TorCounter : Tor counter selection (0 or 1). | | unsigned char_ b_TorCounter : Tor counter selection (0 or 1). |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -994,20 +994,20 @@ INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev,
DWORD dw_Status; DWORD dw_Status;
DWORD dw_DummyRead; DWORD dw_DummyRead;
DWORD dw_ConfigReg; DWORD dw_ConfigReg;
BYTE b_ModulNbr, b_Action; unsigned char b_ModulNbr, b_Action;
BYTE b_TorCounter; unsigned char b_TorCounter;
BYTE b_InputMode; unsigned char b_InputMode;
BYTE b_ExternGate; unsigned char b_ExternGate;
BYTE b_CycleMode; unsigned char b_CycleMode;
BYTE b_InterruptEnable; unsigned char b_InterruptEnable;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_Action = (BYTE) data[0]; // enable or disable b_Action = (unsigned char) data[0]; // enable or disable
b_TorCounter = (BYTE) data[1]; b_TorCounter = (unsigned char) data[1];
b_InputMode = (BYTE) data[2]; b_InputMode = (unsigned char) data[2];
b_ExternGate = (BYTE) data[3]; b_ExternGate = (unsigned char) data[3];
b_CycleMode = (BYTE) data[4]; b_CycleMode = (unsigned char) data[4];
b_InterruptEnable = (BYTE) data[5]; b_InterruptEnable = (unsigned char) data[5];
i_ReturnValue = insn->n;; i_ReturnValue = insn->n;;
devpriv->tsk_Current = current; // Save the current process task structure devpriv->tsk_Current = current; // Save the current process task structure
/**************************/ /**************************/
@ -1381,16 +1381,16 @@ INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_GetTorCounterInitialisation | | Function Name : _INT_ i_APCI1710_GetTorCounterInitialisation |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_TorCounter, | | unsigned char_ b_TorCounter, |
| PBYTE_ pb_TimingUnit, | | unsigned char *_ pb_TimingUnit, |
| PULONG_ pul_TimingInterval, | | PULONG_ pul_TimingInterval, |
| PBYTE_ pb_InputMode, | | unsigned char *_ pb_InputMode, |
| PBYTE_ pb_ExternGate, | | unsigned char *_ pb_ExternGate, |
| PBYTE_ pb_CycleMode, | | unsigned char *_ pb_CycleMode, |
| PBYTE_ pb_Enable, | | unsigned char *_ pb_Enable, |
| PBYTE_ pb_InterruptEnable)| | unsigned char *_ pb_InterruptEnable)|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Enable the tor counter (b_TorCounter) from selected | | Task : Enable the tor counter (b_TorCounter) from selected |
| module (b_ModulNbr). You must calling the | | module (b_ModulNbr). You must calling the |
@ -1403,37 +1403,37 @@ INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev,
| The b_CycleMode parameter determine if you will | | The b_CycleMode parameter determine if you will |
| measured a single or more cycle. | | measured a single or more cycle. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3) | | unsigned char_ b_ModulNbr : Selected module number (0 to 3) |
| BYTE_ b_TorCounter : Tor counter selection (0 or 1) | unsigned char_ b_TorCounter : Tor counter selection (0 or 1)
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_TorCounter = CR_CHAN(insn->chanspec); b_TorCounter = CR_CHAN(insn->chanspec);
. | . |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PBYTE_ pb_TimingUnit : Base timing unit (0 to 4) | | Output Parameters : unsigned char *_ pb_TimingUnit : Base timing unit (0 to 4) |
| 0 : ns | | 0 : ns |
| 1 : µs | | 1 : µs |
| 2 : ms | | 2 : ms |
| 3 : s | | 3 : s |
| 4 : mn | | 4 : mn |
| PULONG_ pul_TimingInterval : Base timing value. | | PULONG_ pul_TimingInterval : Base timing value. |
| PBYTE_ pb_InputMode : Input signal level | | unsigned char *_ pb_InputMode : Input signal level |
| selection | | selection |
| 0 : Tor count each low level | | 0 : Tor count each low level |
| 1 : Tor count each high level| | 1 : Tor count each high level|
| PBYTE_ pb_ExternGate : Extern gate action | | unsigned char *_ pb_ExternGate : Extern gate action |
| selection | | selection |
| 0 : Extern gate signal not | | 0 : Extern gate signal not |
| used | | used |
| 1 : Extern gate signal used| | 1 : Extern gate signal used|
| PBYTE_ pb_CycleMode : Tor counter acquisition | | unsigned char *_ pb_CycleMode : Tor counter acquisition |
| mode | | mode |
| PBYTE_ pb_Enable : Indicate if the tor counter| | unsigned char *_ pb_Enable : Indicate if the tor counter|
| is enabled or no | | is enabled or no |
| 0 : Tor counter disabled | | 0 : Tor counter disabled |
| 1 : Tor counter enabled | | 1 : Tor counter enabled |
| PBYTE_ pb_InterruptEnable : Enable or disable the | | unsigned char *_ pb_InterruptEnable : Enable or disable the |
| tor counter interrupt. | | tor counter interrupt. |
| APCI1710_ENABLE: | | APCI1710_ENABLE: |
| Enable the tor counter | | Enable the tor counter |
@ -1441,13 +1441,13 @@ INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev,
| APCI1710_DISABLE: | | APCI1710_DISABLE: |
| Disable the tor counter | | Disable the tor counter |
| interrupt | interrupt
pb_TimingUnit = (PBYTE) &data[0]; pb_TimingUnit = (unsigned char *) &data[0];
pul_TimingInterval = (PULONG) &data[1]; pul_TimingInterval = (PULONG) &data[1];
pb_InputMode = (PBYTE) &data[2]; pb_InputMode = (unsigned char *) &data[2];
pb_ExternGate = (PBYTE) &data[3]; pb_ExternGate = (unsigned char *) &data[3];
pb_CycleMode = (PBYTE) &data[4]; pb_CycleMode = (unsigned char *) &data[4];
pb_Enable = (PBYTE) &data[5]; pb_Enable = (unsigned char *) &data[5];
pb_InterruptEnable = (PBYTE) &data[6]; pb_InterruptEnable = (unsigned char *) &data[6];
| |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Return Value : 0: No error | | Return Value : 0: No error |
@ -1465,27 +1465,27 @@ INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev,
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_Status; DWORD dw_Status;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_TorCounter; unsigned char b_TorCounter;
PBYTE pb_TimingUnit; unsigned char * pb_TimingUnit;
PULONG pul_TimingInterval; PULONG pul_TimingInterval;
PBYTE pb_InputMode; unsigned char * pb_InputMode;
PBYTE pb_ExternGate; unsigned char * pb_ExternGate;
PBYTE pb_CycleMode; unsigned char * pb_CycleMode;
PBYTE pb_Enable; unsigned char * pb_Enable;
PBYTE pb_InterruptEnable; unsigned char * pb_InterruptEnable;
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_TorCounter = CR_CHAN(insn->chanspec); b_TorCounter = CR_CHAN(insn->chanspec);
pb_TimingUnit = (PBYTE) & data[0]; pb_TimingUnit = (unsigned char *) & data[0];
pul_TimingInterval = (PULONG) & data[1]; pul_TimingInterval = (PULONG) & data[1];
pb_InputMode = (PBYTE) & data[2]; pb_InputMode = (unsigned char *) & data[2];
pb_ExternGate = (PBYTE) & data[3]; pb_ExternGate = (unsigned char *) & data[3];
pb_CycleMode = (PBYTE) & data[4]; pb_CycleMode = (unsigned char *) & data[4];
pb_Enable = (PBYTE) & data[5]; pb_Enable = (unsigned char *) & data[5];
pb_InterruptEnable = (PBYTE) & data[6]; pb_InterruptEnable = (unsigned char *) & data[6];
/**************************/ /**************************/
/* Test the module number */ /* Test the module number */
@ -1526,9 +1526,9 @@ INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev,
(64 * b_ModulNbr)); (64 * b_ModulNbr));
*pb_CycleMode = *pb_CycleMode =
(BYTE) ((dw_Status >> 4) & 1); (unsigned char) ((dw_Status >> 4) & 1);
*pb_InterruptEnable = *pb_InterruptEnable =
(BYTE) ((dw_Status >> 5) & 1); (unsigned char) ((dw_Status >> 5) & 1);
/******************************************************/ /******************************************************/
/* Test if extern gate used for clock or for signal B */ /* Test if extern gate used for clock or for signal B */
@ -1582,10 +1582,10 @@ INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev,
} // if (dw_Status & 0x600) } // if (dw_Status & 0x600)
else { else {
*pb_InputMode = *pb_InputMode =
(BYTE) ((dw_Status >> 6) (unsigned char) ((dw_Status >> 6)
& 1); & 1);
*pb_ExternGate = *pb_ExternGate =
(BYTE) ((dw_Status >> 7) (unsigned char) ((dw_Status >> 7)
& 1); & 1);
} // if (dw_Status & 0x600) } // if (dw_Status & 0x600)
@ -1643,11 +1643,11 @@ INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_ReadTorCounterValue | | Function Name : _INT_ i_APCI1710_ReadTorCounterValue |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_TorCounter, | | unsigned char_ b_TorCounter, |
| UINT_ ui_TimeOut, | | UINT_ ui_TimeOut, |
| PBYTE_ pb_TorCounterStatus, | | unsigned char *_ pb_TorCounterStatus, |
| PULONG_ pul_TorCounterValue) | | PULONG_ pul_TorCounterValue) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task case APCI1710_TOR_GETPROGRESSSTATUS: Return the tor counter | Task case APCI1710_TOR_GETPROGRESSSTATUS: Return the tor counter
@ -1660,15 +1660,15 @@ INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev,
| (pul_TorCounterValue) after a conting cycle stop | | (pul_TorCounterValue) after a conting cycle stop |
| from selected tor counter module (b_ModulNbr). | | from selected tor counter module (b_ModulNbr). |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3) | | unsigned char_ b_ModulNbr : Selected module number (0 to 3) |
| BYTE_ b_TorCounter : Tor counter selection (0 or 1). | unsigned char_ b_TorCounter : Tor counter selection (0 or 1).
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_ReadType = (BYTE) data[0]; b_ReadType = (unsigned char) data[0];
b_TorCounter = (BYTE) data[1]; b_TorCounter = (unsigned char) data[1];
ui_TimeOut = (UINT) data[2]; | ui_TimeOut = (UINT) data[2]; |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PBYTE_ pb_TorCounterStatus : Return the tor counter | | Output Parameters : unsigned char *_ pb_TorCounterStatus : Return the tor counter |
| status. | | status. |
| 0 : Conting cycle not started| | 0 : Conting cycle not started|
| Software gate not set. | | Software gate not set. |
@ -1684,7 +1684,7 @@ INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev,
| "i_APCI1710_InitTorCounter"| | "i_APCI1710_InitTorCounter"|
| 4 : Timeeout occur | | 4 : Timeeout occur |
| PULONG pul_TorCounterValue : Tor counter value. | PULONG pul_TorCounterValue : Tor counter value.
pb_TorCounterStatus=(PBYTE) &data[0]; pb_TorCounterStatus=(unsigned char *) &data[0];
pul_TorCounterValue=(PULONG) &data[1]; | pul_TorCounterValue=(PULONG) &data[1]; |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Return Value : 0: No error | | Return Value : 0: No error |
@ -1707,19 +1707,19 @@ INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device
DWORD dw_Status; DWORD dw_Status;
DWORD dw_TimeOut = 0; DWORD dw_TimeOut = 0;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_TorCounter; unsigned char b_TorCounter;
BYTE b_ReadType; unsigned char b_ReadType;
UINT ui_TimeOut; UINT ui_TimeOut;
PBYTE pb_TorCounterStatus; unsigned char * pb_TorCounterStatus;
PULONG pul_TorCounterValue; PULONG pul_TorCounterValue;
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_ReadType = (BYTE) data[0]; b_ReadType = (unsigned char) data[0];
b_TorCounter = (BYTE) data[1]; b_TorCounter = (unsigned char) data[1];
ui_TimeOut = (UINT) data[2]; ui_TimeOut = (UINT) data[2];
pb_TorCounterStatus = (PBYTE) & data[0]; pb_TorCounterStatus = (unsigned char *) & data[0];
pul_TorCounterValue = (PULONG) & data[1]; pul_TorCounterValue = (PULONG) & data[1];
/**************************/ /**************************/

122
drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
View file

@ -63,12 +63,12 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_InitTTLIODirection | | Function Name : _INT_ i_APCI1710_InitTTLIODirection |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_PortAMode, | | unsigned char_ b_PortAMode, |
| BYTE_ b_PortBMode, | | unsigned char_ b_PortBMode, |
| BYTE_ b_PortCMode, | | unsigned char_ b_PortCMode, |
| BYTE_ b_PortDMode) | | unsigned char_ b_PortDMode) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task APCI1710_TTL_INIT (using defaults) : Configure the TTL I/O operating mode from selected | | Task APCI1710_TTL_INIT (using defaults) : Configure the TTL I/O operating mode from selected |
| module (b_ModulNbr). You must calling this function be| | module (b_ModulNbr). You must calling this function be|
@ -76,15 +76,15 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
APCI1710_TTL_INITDIRECTION(user inputs for direction) APCI1710_TTL_INITDIRECTION(user inputs for direction)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710| | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710|
| BYTE_ b_ModulNbr : Module number to | | unsigned char_ b_ModulNbr : Module number to |
| configure (0 to 3) | configure (0 to 3)
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_InitType = (BYTE) data[0]; b_InitType = (unsigned char) data[0];
b_PortAMode = (BYTE) data[1]; b_PortAMode = (unsigned char) data[1];
b_PortBMode = (BYTE) data[2]; b_PortBMode = (unsigned char) data[2];
b_PortCMode = (BYTE) data[3]; b_PortCMode = (unsigned char) data[3];
b_PortDMode = (BYTE) data[4];| b_PortDMode = (unsigned char) data[4];|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -104,15 +104,15 @@ INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device * dev, struct comedi_sub
struct comedi_insn * insn, unsigned int * data) struct comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_InitType; unsigned char b_InitType;
BYTE b_PortAMode; unsigned char b_PortAMode;
BYTE b_PortBMode; unsigned char b_PortBMode;
BYTE b_PortCMode; unsigned char b_PortCMode;
BYTE b_PortDMode; unsigned char b_PortDMode;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_InitType = (BYTE) data[0]; b_InitType = (unsigned char) data[0];
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
/**************************/ /**************************/
@ -172,10 +172,10 @@ INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device * dev, struct comedi_sub
case APCI1710_TTL_INITDIRECTION: case APCI1710_TTL_INITDIRECTION:
b_PortAMode = (BYTE) data[1]; b_PortAMode = (unsigned char) data[1];
b_PortBMode = (BYTE) data[2]; b_PortBMode = (unsigned char) data[2];
b_PortCMode = (BYTE) data[3]; b_PortCMode = (unsigned char) data[3];
b_PortDMode = (BYTE) data[4]; b_PortDMode = (unsigned char) data[4];
/********************/ /********************/
/* Test the version */ /* Test the version */
@ -352,11 +352,11 @@ INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device * dev, struct comedi_sub
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_ReadTTLIOChannelValue | | Function Name : _INT_ i_APCI1710_ReadTTLIOChannelValue |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_SelectedPort, | | unsigned char_ b_SelectedPort, |
| BYTE_ b_InputChannel, | | unsigned char_ b_InputChannel, |
| PBYTE_ pb_ChannelStatus) | | unsigned char *_ pb_ChannelStatus) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read the status from selected TTL digital input | | Task : Read the status from selected TTL digital input |
| (b_InputChannel) | (b_InputChannel)
@ -366,32 +366,32 @@ INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device * dev, struct comedi_sub
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710| | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710|
| BYTE_ b_ModulNbr : Module number to | | unsigned char_ b_ModulNbr : Module number to |
| configure (0 to 7) | | configure (0 to 7) |
| BYTE_ b_SelectedPort, : Selection from TTL I/O | | unsigned char_ b_SelectedPort, : Selection from TTL I/O |
| port (0 to 2) | | port (0 to 2) |
| 0 : Port A selection | | 0 : Port A selection |
| 1 : Port B selection | | 1 : Port B selection |
| 2 : Port C selection | | 2 : Port C selection |
| 3 : Port D selection | | 3 : Port D selection |
| BYTE_ b_InputChannel : Selection from digital | | unsigned char_ b_InputChannel : Selection from digital |
| input ( 0 to 2) | input ( 0 to 2)
APCI1710_TTL_READCHANNEL APCI1710_TTL_READCHANNEL
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_SelectedPort= CR_RANGE(insn->chanspec); b_SelectedPort= CR_RANGE(insn->chanspec);
b_InputChannel= CR_CHAN(insn->chanspec); b_InputChannel= CR_CHAN(insn->chanspec);
b_ReadType = (BYTE) data[0]; b_ReadType = (unsigned char) data[0];
APCI1710_TTL_READPORT| APCI1710_TTL_READPORT|
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_SelectedPort= CR_RANGE(insn->chanspec); b_SelectedPort= CR_RANGE(insn->chanspec);
b_ReadType = (BYTE) data[0]; b_ReadType = (unsigned char) data[0];
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : data[0] | Output Parameters : data[0]
PBYTE_ pb_ChannelStatus : Digital input channel | unsigned char *_ pb_ChannelStatus : Digital input channel |
| status | | status |
| 0 : Channle is not active| | 0 : Channle is not active|
| 1 : Channle is active | | 1 : Channle is active |
@ -411,15 +411,15 @@ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subde
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_StatusReg; DWORD dw_StatusReg;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_SelectedPort; unsigned char b_SelectedPort;
BYTE b_InputChannel; unsigned char b_InputChannel;
BYTE b_ReadType; unsigned char b_ReadType;
PBYTE pb_ChannelStatus; unsigned char * pb_ChannelStatus;
PBYTE pb_PortValue; unsigned char * pb_PortValue;
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
b_ReadType = (BYTE) data[0]; b_ReadType = (unsigned char) data[0];
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_SelectedPort = CR_RANGE(insn->chanspec); b_SelectedPort = CR_RANGE(insn->chanspec);
b_InputChannel = CR_CHAN(insn->chanspec); b_InputChannel = CR_CHAN(insn->chanspec);
@ -439,7 +439,7 @@ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subde
switch (b_ReadType) { switch (b_ReadType) {
case APCI1710_TTL_READCHANNEL: case APCI1710_TTL_READCHANNEL:
pb_ChannelStatus = (PBYTE) & data[0]; pb_ChannelStatus = (unsigned char *) & data[0];
/********************************/ /********************************/
/* Test the TTL I/O port number */ /* Test the TTL I/O port number */
/********************************/ /********************************/
@ -493,7 +493,7 @@ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subde
*pb_ChannelStatus *pb_ChannelStatus
= =
(BYTE) ( (unsigned char) (
(dw_StatusReg (dw_StatusReg
>> >>
(8 * b_SelectedPort)) >> b_InputChannel) & 1; (8 * b_SelectedPort)) >> b_InputChannel) & 1;
@ -533,7 +533,7 @@ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subde
break; break;
case APCI1710_TTL_READPORT: case APCI1710_TTL_READPORT:
pb_PortValue = (PBYTE) & data[0]; pb_PortValue = (unsigned char *) & data[0];
/********************************/ /********************************/
/* Test the TTL I/O port number */ /* Test the TTL I/O port number */
/********************************/ /********************************/
@ -578,7 +578,7 @@ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subde
(64 * b_ModulNbr)); (64 * b_ModulNbr));
*pb_PortValue = *pb_PortValue =
(BYTE) ( (unsigned char) (
(dw_StatusReg >> (dw_StatusReg >>
(8 * b_SelectedPort)) & 0xFF); (8 * b_SelectedPort)) & 0xFF);
} else { } else {
@ -640,8 +640,8 @@ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subde
| (port A, port B and port C) from selected TTL | | (port A, port B and port C) from selected TTL |
| module (b_ModulNbr) | | module (b_ModulNbr) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710| | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710|
| BYTE_ b_ModulNbr : Module number to | | unsigned char_ b_ModulNbr : Module number to |
| configure (0 to 3) | | configure (0 to 3) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : PULONG_ pul_PortValue : Digital TTL inputs port | | Output Parameters : PULONG_ pul_PortValue : Digital TTL inputs port |
@ -660,10 +660,10 @@ INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device * dev,
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_StatusReg; DWORD dw_StatusReg;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
PULONG pul_PortValue; PULONG pul_PortValue;
b_ModulNbr = (BYTE) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
i_ReturnValue = insn->n; i_ReturnValue = insn->n;
pul_PortValue = (PULONG) & data[0]; pul_PortValue = (PULONG) & data[0];
@ -789,9 +789,9 @@ INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : _INT_ i_APCI1710_SetTTLIOChlOn | | Function Name : _INT_ i_APCI1710_SetTTLIOChlOn |
| (BYTE_ b_BoardHandle, | | (unsigned char_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | unsigned char_ b_ModulNbr, |
| BYTE_ b_OutputChannel) | unsigned char_ b_OutputChannel)
INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,struct comedi_subdevice *s, INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,struct comedi_subdevice *s,
struct comedi_insn *insn,unsigned int *data) | struct comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -799,9 +799,9 @@ INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,struct comedi
| parameter b_Channel. Setting an output means setting | | parameter b_Channel. Setting an output means setting |
| an ouput high. | | an ouput high. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE_ b_BoardHandle : Handle of board APCI-1710 | | Input Parameters : unsigned char_ b_BoardHandle : Handle of board APCI-1710 |
| BYTE_ b_ModulNbr : Selected module number (0 to 3)| | unsigned char_ b_ModulNbr : Selected module number (0 to 3)|
| BYTE_ b_OutputChannel : Selection from digital output | | unsigned char_ b_OutputChannel : Selection from digital output |
| channel (0 or 1) | | channel (0 or 1) |
| 0 : PD0 | | 0 : PD0 |
| 1 : PD1 | | 1 : PD1 |
@ -830,8 +830,8 @@ INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device * dev,
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_StatusReg = 0; DWORD dw_StatusReg = 0;
BYTE b_ModulNbr; unsigned char b_ModulNbr;
BYTE b_OutputChannel; unsigned char b_OutputChannel;
UINT ui_State; UINT ui_State;
i_ReturnValue = insn->n; i_ReturnValue = insn->n;

10
drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
View file

@ -74,11 +74,11 @@ INT i_AddiHeaderRW_ReadEeprom(INT i_NbOfWordsToRead,
INT i_Counter = 0; INT i_Counter = 0;
INT i_WordCounter; INT i_WordCounter;
INT i; INT i;
BYTE pb_ReadByte[1]; unsigned char pb_ReadByte[1];
BYTE b_ReadLowByte = 0; unsigned char b_ReadLowByte = 0;
BYTE b_ReadHighByte = 0; unsigned char b_ReadHighByte = 0;
BYTE b_SelectedAddressLow = 0; unsigned char b_SelectedAddressLow = 0;
BYTE b_SelectedAddressHigh = 0; unsigned char b_SelectedAddressHigh = 0;
WORD w_ReadWord = 0; WORD w_ReadWord = 0;
for (i_WordCounter = 0; i_WordCounter < i_NbOfWordsToRead; for (i_WordCounter = 0; i_WordCounter < i_NbOfWordsToRead;

149
drivers/staging/comedi/drivers/addi-data/addi_common.h
View file

@ -37,7 +37,6 @@
#define SUCCESS 1 #define SUCCESS 1
/* variable type definition */ /* variable type definition */
typedef unsigned char BYTE, *PBYTE;
typedef short SHORT, *PSHORT; typedef short SHORT, *PSHORT;
typedef unsigned short USHORT, *PUSHORT; typedef unsigned short USHORT, *PUSHORT;
typedef unsigned short WORD, *PWORD; typedef unsigned short WORD, *PWORD;
@ -50,8 +49,8 @@ typedef unsigned long ULONG_PTR;
typedef const struct comedi_lrange *PCRANGE; typedef const struct comedi_lrange *PCRANGE;
#define LOBYTE(W) (BYTE)((W) & 0xFF) #define LOBYTE(W) (unsigned char)((W) & 0xFF)
#define HIBYTE(W) (BYTE)(((W) >> 8) & 0xFF) #define HIBYTE(W) (unsigned char)(((W) >> 8) & 0xFF)
#define MAKEWORD(H, L) (USHORT)((L) | ((H) << 8)) #define MAKEWORD(H, L) (USHORT)((L) | ((H) << 8))
#define LOWORD(W) (USHORT)((W) & 0xFFFF) #define LOWORD(W) (USHORT)((W) & 0xFFFF)
#define HIWORD(W) (USHORT)(((W) >> 16) & 0xFFFF) #define HIWORD(W) (USHORT)(((W) >> 16) & 0xFFFF)
@ -103,7 +102,7 @@ typedef struct {
INT i_Dma; // dma present or not INT i_Dma; // dma present or not
INT i_Timer; // timer subdevice present or not INT i_Timer; // timer subdevice present or not
BYTE b_AvailableConvertUnit; unsigned char b_AvailableConvertUnit;
UINT ui_MinAcquisitiontimeNs; // Minimum Acquisition in Nano secs UINT ui_MinAcquisitiontimeNs; // Minimum Acquisition in Nano secs
UINT ui_MinDelaytimeNs; // Minimum Delay in Nano secs UINT ui_MinDelaytimeNs; // Minimum Delay in Nano secs
@ -222,10 +221,10 @@ typedef union {
struct { struct {
union { union {
struct { struct {
BYTE b_ModeRegister1; unsigned char b_ModeRegister1;
BYTE b_ModeRegister2; unsigned char b_ModeRegister2;
BYTE b_ModeRegister3; unsigned char b_ModeRegister3;
BYTE b_ModeRegister4; unsigned char b_ModeRegister4;
} s_ByteModeRegister; } s_ByteModeRegister;
DWORD dw_ModeRegister1_2_3_4; DWORD dw_ModeRegister1_2_3_4;
} s_ModeRegister; } s_ModeRegister;
@ -244,24 +243,24 @@ typedef union {
/* SSI infos */ /* SSI infos */
struct { struct {
BYTE b_SSIProfile; unsigned char b_SSIProfile;
BYTE b_PositionTurnLength; unsigned char b_PositionTurnLength;
BYTE b_TurnCptLength; unsigned char b_TurnCptLength;
BYTE b_SSIInit; unsigned char b_SSIInit;
} s_SSICounterInfo; } s_SSICounterInfo;
/* TTL I/O infos */ /* TTL I/O infos */
struct { struct {
BYTE b_TTLInit; unsigned char b_TTLInit;
BYTE b_PortConfiguration[4]; unsigned char b_PortConfiguration[4];
} s_TTLIOInfo; } s_TTLIOInfo;
/* Digital I/O infos */ /* Digital I/O infos */
struct { struct {
BYTE b_DigitalInit; unsigned char b_DigitalInit;
BYTE b_ChannelAMode; unsigned char b_ChannelAMode;
BYTE b_ChannelBMode; unsigned char b_ChannelBMode;
BYTE b_OutputMemoryEnabled; unsigned char b_OutputMemoryEnabled;
DWORD dw_OutputMemory; DWORD dw_OutputMemory;
} s_DigitalIOInfo; } s_DigitalIOInfo;
@ -271,14 +270,14 @@ typedef union {
struct { struct {
struct { struct {
BYTE b_82X54Init; unsigned char b_82X54Init;
BYTE b_InputClockSelection; unsigned char b_InputClockSelection;
BYTE b_InputClockLevel; unsigned char b_InputClockLevel;
BYTE b_OutputLevel; unsigned char b_OutputLevel;
BYTE b_HardwareGateLevel; unsigned char b_HardwareGateLevel;
DWORD dw_ConfigurationWord; DWORD dw_ConfigurationWord;
} s_82X54TimerInfo[3]; } s_82X54TimerInfo[3];
BYTE b_InterruptMask; unsigned char b_InterruptMask;
} s_82X54ModuleInfo; } s_82X54ModuleInfo;
/*********************/ /*********************/
@ -286,11 +285,11 @@ typedef union {
/*********************/ /*********************/
struct { struct {
BYTE b_ChronoInit; unsigned char b_ChronoInit;
BYTE b_InterruptMask; unsigned char b_InterruptMask;
BYTE b_PCIInputClock; unsigned char b_PCIInputClock;
BYTE b_TimingUnit; unsigned char b_TimingUnit;
BYTE b_CycleMode; unsigned char b_CycleMode;
double d_TimingInterval; double d_TimingInterval;
DWORD dw_ConfigReg; DWORD dw_ConfigReg;
} s_ChronoModuleInfo; } s_ChronoModuleInfo;
@ -301,7 +300,7 @@ typedef union {
struct { struct {
struct { struct {
BYTE b_PulseEncoderInit; unsigned char b_PulseEncoderInit;
} s_PulseEncoderInfo[4]; } s_PulseEncoderInfo[4];
DWORD dw_SetRegister; DWORD dw_SetRegister;
DWORD dw_ControlRegister; DWORD dw_ControlRegister;
@ -311,49 +310,49 @@ typedef union {
/* Tor conter infos */ /* Tor conter infos */
struct { struct {
struct { struct {
BYTE b_TorCounterInit; unsigned char b_TorCounterInit;
BYTE b_TimingUnit; unsigned char b_TimingUnit;
BYTE b_InterruptEnable; unsigned char b_InterruptEnable;
double d_TimingInterval; double d_TimingInterval;
ULONG ul_RealTimingInterval; ULONG ul_RealTimingInterval;
} s_TorCounterInfo[2]; } s_TorCounterInfo[2];
BYTE b_PCIInputClock; unsigned char b_PCIInputClock;
} s_TorCounterModuleInfo; } s_TorCounterModuleInfo;
/* PWM infos */ /* PWM infos */
struct { struct {
struct { struct {
BYTE b_PWMInit; unsigned char b_PWMInit;
BYTE b_TimingUnit; unsigned char b_TimingUnit;
BYTE b_InterruptEnable; unsigned char b_InterruptEnable;
double d_LowTiming; double d_LowTiming;
double d_HighTiming; double d_HighTiming;
ULONG ul_RealLowTiming; ULONG ul_RealLowTiming;
ULONG ul_RealHighTiming; ULONG ul_RealHighTiming;
} s_PWMInfo[2]; } s_PWMInfo[2];
BYTE b_ClockSelection; unsigned char b_ClockSelection;
} s_PWMModuleInfo; } s_PWMModuleInfo;
/* ETM infos */ /* ETM infos */
struct { struct {
struct { struct {
BYTE b_ETMEnable; unsigned char b_ETMEnable;
BYTE b_ETMInterrupt; unsigned char b_ETMInterrupt;
} s_ETMInfo[2]; } s_ETMInfo[2];
BYTE b_ETMInit; unsigned char b_ETMInit;
BYTE b_TimingUnit; unsigned char b_TimingUnit;
BYTE b_ClockSelection; unsigned char b_ClockSelection;
double d_TimingInterval; double d_TimingInterval;
ULONG ul_Timing; ULONG ul_Timing;
} s_ETMModuleInfo; } s_ETMModuleInfo;
/* CDA infos */ /* CDA infos */
struct { struct {
BYTE b_CDAEnable; unsigned char b_CDAEnable;
BYTE b_CDAInterrupt; unsigned char b_CDAInterrupt;
BYTE b_CDAInit; unsigned char b_CDAInit;
BYTE b_FctSelection; unsigned char b_FctSelection;
BYTE b_CDAReadFIFOOverflow; unsigned char b_CDAReadFIFOOverflow;
} s_CDAModuleInfo; } s_CDAModuleInfo;
} str_ModuleInfo; } str_ModuleInfo;
@ -367,10 +366,10 @@ typedef struct {
INT i_IobaseReserved; INT i_IobaseReserved;
ULONG_PTR dw_AiBase; ULONG_PTR dw_AiBase;
struct pcilst_struct *amcc; // ptr too AMCC data struct pcilst_struct *amcc; // ptr too AMCC data
BYTE allocated; // we have blocked card unsigned char allocated; // we have blocked card
BYTE b_ValidDriver; // driver is ok unsigned char b_ValidDriver; // driver is ok
BYTE b_AiContinuous; // we do unlimited AI unsigned char b_AiContinuous; // we do unlimited AI
BYTE b_AiInitialisation; unsigned char b_AiInitialisation;
UINT ui_AiActualScan; //how many scans we finished UINT ui_AiActualScan; //how many scans we finished
UINT ui_AiBufferPtr; // data buffer ptr in samples UINT ui_AiBufferPtr; // data buffer ptr in samples
UINT ui_AiNbrofChannels; // how many channels is measured UINT ui_AiNbrofChannels; // how many channels is measured
@ -378,7 +377,7 @@ typedef struct {
UINT ui_AiActualScanPosition; // position in actual scan UINT ui_AiActualScanPosition; // position in actual scan
PUINT pui_AiChannelList; // actual chanlist PUINT pui_AiChannelList; // actual chanlist
UINT ui_AiChannelList[32]; // actual chanlist UINT ui_AiChannelList[32]; // actual chanlist
BYTE b_AiChannelConfiguration[32]; // actual chanlist unsigned char b_AiChannelConfiguration[32]; // actual chanlist
UINT ui_AiReadData[32]; UINT ui_AiReadData[32];
DWORD dw_AiInitialised; DWORD dw_AiInitialised;
UINT ui_AiTimer0; //Timer Constant for Timer0 UINT ui_AiTimer0; //Timer Constant for Timer0
@ -388,7 +387,7 @@ typedef struct {
short *AiData; // Pointer to sample data short *AiData; // Pointer to sample data
UINT ui_AiNbrofScans; // number of scans to do UINT ui_AiNbrofScans; // number of scans to do
USHORT us_UseDma; // To use Dma or not USHORT us_UseDma; // To use Dma or not
BYTE b_DmaDoubleBuffer; // we can use double buffering unsigned char b_DmaDoubleBuffer; // we can use double buffering
UINT ui_DmaActualBuffer; // which buffer is used now UINT ui_DmaActualBuffer; // which buffer is used now
//*UPDATE-0.7.57->0.7.68 //*UPDATE-0.7.57->0.7.68
//ULONG ul_DmaBufferVirtual[2];// pointers to begin of DMA buffer //ULONG ul_DmaBufferVirtual[2];// pointers to begin of DMA buffer
@ -398,25 +397,25 @@ typedef struct {
UINT ui_DmaBufferUsesize[2]; // which size we may now used for transfer UINT ui_DmaBufferUsesize[2]; // which size we may now used for transfer
UINT ui_DmaBufferSamples[2]; // size in samples UINT ui_DmaBufferSamples[2]; // size in samples
UINT ui_DmaBufferPages[2]; // number of pages in buffer UINT ui_DmaBufferPages[2]; // number of pages in buffer
BYTE b_DigitalOutputRegister; // Digital Output Register unsigned char b_DigitalOutputRegister; // Digital Output Register
BYTE b_OutputMemoryStatus; unsigned char b_OutputMemoryStatus;
BYTE b_AnalogInputChannelNbr; // Analog input channel Nbr unsigned char b_AnalogInputChannelNbr; // Analog input channel Nbr
BYTE b_AnalogOutputChannelNbr; // Analog input Output Nbr unsigned char b_AnalogOutputChannelNbr; // Analog input Output Nbr
BYTE b_TimerSelectMode; // Contain data written at iobase + 0C unsigned char b_TimerSelectMode; // Contain data written at iobase + 0C
BYTE b_ModeSelectRegister; // Contain data written at iobase + 0E unsigned char b_ModeSelectRegister; // Contain data written at iobase + 0E
USHORT us_OutputRegister; // Contain data written at iobase + 0 USHORT us_OutputRegister; // Contain data written at iobase + 0
BYTE b_InterruptState; unsigned char b_InterruptState;
BYTE b_TimerInit; // Specify if InitTimerWatchdog was load unsigned char b_TimerInit; // Specify if InitTimerWatchdog was load
BYTE b_TimerStarted; // Specify if timer 2 is running or not unsigned char b_TimerStarted; // Specify if timer 2 is running or not
BYTE b_Timer2Mode; // Specify the timer 2 mode unsigned char b_Timer2Mode; // Specify the timer 2 mode
BYTE b_Timer2Interrupt; //Timer2 interrupt enable or disable unsigned char b_Timer2Interrupt; //Timer2 interrupt enable or disable
BYTE b_AiCyclicAcquisition; // indicate cyclic acquisition unsigned char b_AiCyclicAcquisition; // indicate cyclic acquisition
BYTE b_InterruptMode; // eoc eos or dma unsigned char b_InterruptMode; // eoc eos or dma
BYTE b_EocEosInterrupt; // Enable disable eoc eos interrupt unsigned char b_EocEosInterrupt; // Enable disable eoc eos interrupt
UINT ui_EocEosConversionTime; UINT ui_EocEosConversionTime;
BYTE b_EocEosConversionTimeBase; unsigned char b_EocEosConversionTimeBase;
BYTE b_SingelDiff; unsigned char b_SingelDiff;
BYTE b_ExttrigEnable; /* To enable or disable external trigger */ unsigned char b_ExttrigEnable; /* To enable or disable external trigger */
/* Pointer to the current process */ /* Pointer to the current process */
struct task_struct *tsk_Current; struct task_struct *tsk_Current;
@ -426,9 +425,9 @@ typedef struct {
struct { struct {
UINT ui_Address; /* Board address */ UINT ui_Address; /* Board address */
UINT ui_FlashAddress; UINT ui_FlashAddress;
BYTE b_InterruptNbr; /* Board interrupt number */ unsigned char b_InterruptNbr; /* Board interrupt number */
BYTE b_SlotNumber; /* PCI slot number */ unsigned char b_SlotNumber; /* PCI slot number */
BYTE b_BoardVersion; unsigned char b_BoardVersion;
DWORD dw_MolduleConfiguration[4]; /* Module config */ DWORD dw_MolduleConfiguration[4]; /* Module config */
} s_BoardInfos; } s_BoardInfos;
@ -439,7 +438,7 @@ typedef struct {
UINT ui_Read; /* Read FIFO */ UINT ui_Read; /* Read FIFO */
UINT ui_Write; /* Write FIFO */ UINT ui_Write; /* Write FIFO */
struct { struct {
BYTE b_OldModuleMask; unsigned char b_OldModuleMask;
ULONG ul_OldInterruptMask; /* Interrupt mask */ ULONG ul_OldInterruptMask; /* Interrupt mask */
ULONG ul_OldCounterLatchValue; /* Interrupt counter value */ ULONG ul_OldCounterLatchValue; /* Interrupt counter value */
} s_FIFOInterruptParameters[APCI1710_SAVE_INTERRUPT]; } s_FIFOInterruptParameters[APCI1710_SAVE_INTERRUPT];

54
drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
View file

@ -68,19 +68,19 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
#define EEPROM_TIMER_WATCHDOG_COUNTER 10 #define EEPROM_TIMER_WATCHDOG_COUNTER 10
struct str_Functionality { struct str_Functionality {
BYTE b_Type; unsigned char b_Type;
WORD w_Address; WORD w_Address;
}; };
typedef struct { typedef struct {
WORD w_HeaderSize; WORD w_HeaderSize;
BYTE b_Nfunctions; unsigned char b_Nfunctions;
struct str_Functionality s_Functions[7]; struct str_Functionality s_Functions[7];
} str_MainHeader; } str_MainHeader;
typedef struct { typedef struct {
WORD w_Nchannel; WORD w_Nchannel;
BYTE b_Interruptible; unsigned char b_Interruptible;
WORD w_NinterruptLogic; WORD w_NinterruptLogic;
} str_DigitalInputHeader; } str_DigitalInputHeader;
@ -92,10 +92,10 @@ typedef struct {
typedef struct { typedef struct {
WORD w_HeaderSize; WORD w_HeaderSize;
BYTE b_Resolution; unsigned char b_Resolution;
BYTE b_Mode; // in case of Watchdog it is functionality unsigned char b_Mode; // in case of Watchdog it is functionality
WORD w_MinTiming; WORD w_MinTiming;
BYTE b_TimeBase; unsigned char b_TimeBase;
} str_TimerDetails; } str_TimerDetails;
typedef struct { typedef struct {
@ -105,15 +105,15 @@ typedef struct {
typedef struct { typedef struct {
WORD w_Nchannel; WORD w_Nchannel;
BYTE b_Resolution; unsigned char b_Resolution;
} str_AnalogOutputHeader; } str_AnalogOutputHeader;
typedef struct { typedef struct {
WORD w_Nchannel; WORD w_Nchannel;
WORD w_MinConvertTiming; WORD w_MinConvertTiming;
WORD w_MinDelayTiming; WORD w_MinDelayTiming;
BYTE b_HasDma; unsigned char b_HasDma;
BYTE b_Resolution; unsigned char b_Resolution;
} str_AnalogInputHeader; } str_AnalogInputHeader;
/*****************************************/ /*****************************************/
@ -152,7 +152,7 @@ void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress);
void v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue); void v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue);
void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress); void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress);
void v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand, void v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand,
BYTE b_DataLengthInBits); unsigned char b_DataLengthInBits);
void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value); void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value);
/* /*
@ -180,17 +180,17 @@ WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, char *pc_PCIChipInformation,
WORD w_EepromStartAddress) WORD w_EepromStartAddress)
{ {
BYTE b_Counter = 0; unsigned char b_Counter = 0;
BYTE b_ReadByte = 0; unsigned char b_ReadByte = 0;
BYTE b_ReadLowByte = 0; unsigned char b_ReadLowByte = 0;
BYTE b_ReadHighByte = 0; unsigned char b_ReadHighByte = 0;
BYTE b_SelectedAddressLow = 0; unsigned char b_SelectedAddressLow = 0;
BYTE b_SelectedAddressHigh = 0; unsigned char b_SelectedAddressHigh = 0;
WORD w_ReadWord = 0; WORD w_ReadWord = 0;
@ -384,7 +384,7 @@ WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, char *pc_PCIChipInformation,
void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress) void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress)
{ {
BYTE b_EepromBusy = 0; unsigned char b_EepromBusy = 0;
do do
{ {
@ -492,7 +492,7 @@ void v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue)
| DWORD dw_EepromCommand, | | DWORD dw_EepromCommand, |
| BYTE b_DataLengthInBits) | | unsigned char b_DataLengthInBits) |
+---------------------------------------------------------------------------------+ +---------------------------------------------------------------------------------+
@ -504,7 +504,7 @@ void v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue)
| DWORD dw_EepromCommand : PCI eeprom command to write. | | DWORD dw_EepromCommand : PCI eeprom command to write. |
| BYTE b_DataLengthInBits : PCI eeprom command data length. | | unsigned char b_DataLengthInBits : PCI eeprom command data length. |
+---------------------------------------------------------------------------------+ +---------------------------------------------------------------------------------+
@ -519,7 +519,7 @@ void v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue)
*/ */
void v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand, void v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand,
BYTE b_DataLengthInBits) unsigned char b_DataLengthInBits)
{ {
char c_BitPos = 0; char c_BitPos = 0;
@ -824,14 +824,14 @@ INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress,
// Read nbr of functionality // Read nbr of functionality
w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress, w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
pc_PCIChipInformation, 0x100 + 10); pc_PCIChipInformation, 0x100 + 10);
s_MainHeader.b_Nfunctions = (BYTE) w_Temp & 0x00FF; s_MainHeader.b_Nfunctions = (unsigned char) w_Temp & 0x00FF;
// Read functionality details // Read functionality details
for (i = 0; i < s_MainHeader.b_Nfunctions; i++) { for (i = 0; i < s_MainHeader.b_Nfunctions; i++) {
// Read Type // Read Type
w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress, w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
pc_PCIChipInformation, 0x100 + 12 + w_Count); pc_PCIChipInformation, 0x100 + 12 + w_Count);
s_MainHeader.s_Functions[i].b_Type = (BYTE) w_Temp & 0x3F; s_MainHeader.s_Functions[i].b_Type = (unsigned char) w_Temp & 0x3F;
w_Count = w_Count + 2; w_Count = w_Count + 2;
//Read Address //Read Address
s_MainHeader.s_Functions[i].w_Address = s_MainHeader.s_Functions[i].w_Address =
@ -953,7 +953,7 @@ INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress,
// interruptible or not // interruptible or not
w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress, w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
pc_PCIChipInformation, 0x100 + w_Address + 8); pc_PCIChipInformation, 0x100 + w_Address + 8);
s_Header->b_Interruptible = (BYTE) (w_Temp >> 7) & 0x01; s_Header->b_Interruptible = (unsigned char) (w_Temp >> 7) & 0x01;
// How many interruptible logic // How many interruptible logic
s_Header->w_NinterruptLogic = s_Header->w_NinterruptLogic =
@ -1039,11 +1039,11 @@ INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress,
//Read Resolution //Read Resolution
s_Header->s_TimerDetails[i].b_Resolution = s_Header->s_TimerDetails[i].b_Resolution =
(BYTE) (w_Temp >> 10) & 0x3F; (unsigned char) (w_Temp >> 10) & 0x3F;
//Read Mode //Read Mode
s_Header->s_TimerDetails[i].b_Mode = s_Header->s_TimerDetails[i].b_Mode =
(BYTE) (w_Temp >> 4) & 0x3F; (unsigned char) (w_Temp >> 4) & 0x3F;
w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress, w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
pc_PCIChipInformation, pc_PCIChipInformation,
@ -1053,7 +1053,7 @@ INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress,
s_Header->s_TimerDetails[i].w_MinTiming = (w_Temp >> 6) & 0x3FF; s_Header->s_TimerDetails[i].w_MinTiming = (w_Temp >> 6) & 0x3FF;
//Read Timebase //Read Timebase
s_Header->s_TimerDetails[i].b_TimeBase = (BYTE) (w_Temp) & 0x3F; s_Header->s_TimerDetails[i].b_TimeBase = (unsigned char) (w_Temp) & 0x3F;
w_Size += s_Header->s_TimerDetails[i].w_HeaderSize; w_Size += s_Header->s_TimerDetails[i].w_HeaderSize;
} }
@ -1093,7 +1093,7 @@ INT i_EepromReadAnlogOutputHeader(WORD w_PCIBoardEepromAddress,
// Resolution for 1st hard component // Resolution for 1st hard component
w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress, w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress,
pc_PCIChipInformation, 0x100 + w_Address + 16); pc_PCIChipInformation, 0x100 + w_Address + 16);
s_Header->b_Resolution = (BYTE) (w_Temp >> 8) & 0xFF; s_Header->b_Resolution = (unsigned char) (w_Temp >> 8) & 0xFF;
return 0; return 0;
} }

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

@ -234,11 +234,11 @@ int i_APCI1710_Reset(struct comedi_device * dev)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function's Name : __void__ v_APCI1710_InterruptFunction | | Function's Name : __void__ v_APCI1710_InterruptFunction |
| (BYTE b_Interrupt, __CPPARGS) | | (unsigned char b_Interrupt, __CPPARGS) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : APCI-1710 interrupt function | | Task : APCI-1710 interrupt function |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : BYTE b_Interrupt : Interrupt number | | Input Parameters : unsigned char b_Interrupt : Interrupt number |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -250,11 +250,11 @@ int i_APCI1710_Reset(struct comedi_device * dev)
void v_APCI1710_Interrupt(int irq, void *d) void v_APCI1710_Interrupt(int irq, void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
BYTE b_ModuleCpt = 0; unsigned char b_ModuleCpt = 0;
BYTE b_InterruptFlag = 0; unsigned char b_InterruptFlag = 0;
BYTE b_PWMCpt = 0; unsigned char b_PWMCpt = 0;
BYTE b_TorCounterCpt = 0; unsigned char b_TorCounterCpt = 0;
BYTE b_PulseIncoderCpt = 0; unsigned char b_PulseIncoderCpt = 0;
UINT ui_16BitValue; UINT ui_16BitValue;
ULONG ul_InterruptLatchReg = 0; ULONG ul_InterruptLatchReg = 0;
ULONG ul_LatchRegisterValue = 0; ULONG ul_LatchRegisterValue = 0;

8
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
View file

@ -850,22 +850,22 @@ INT i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device * dev,
/***********************************/ /***********************************/
/* Get the software trigger status */ /* Get the software trigger status */
/***********************************/ /***********************************/
data[1] = (BYTE) ((ul_Command1 >> 1) & 1); data[1] = (unsigned char) ((ul_Command1 >> 1) & 1);
/***********************************/ /***********************************/
/* Get the hardware trigger status */ /* Get the hardware trigger status */
/***********************************/ /***********************************/
data[2] = (BYTE) ((ul_Command1 >> 2) & 1); data[2] = (unsigned char) ((ul_Command1 >> 2) & 1);
/*********************************/ /*********************************/
/* Get the software clear status */ /* Get the software clear status */
/*********************************/ /*********************************/
data[3] = (BYTE) ((ul_Command1 >> 3) & 1); data[3] = (unsigned char) ((ul_Command1 >> 3) & 1);
/***************************/ /***************************/
/* Get the overflow status */ /* Get the overflow status */
/***************************/ /***************************/
data[4] = (BYTE) ((ul_Command1 >> 0) & 1); data[4] = (unsigned char) ((ul_Command1 >> 0) & 1);
} // else if (devpriv->b_TimerSelectMode==ADDIDATA_COUNTER) } // else if (devpriv->b_TimerSelectMode==ADDIDATA_COUNTER)
else if ((devpriv->b_TimerSelectMode != ADDIDATA_TIMER) else if ((devpriv->b_TimerSelectMode != ADDIDATA_TIMER)
&& (devpriv->b_TimerSelectMode != ADDIDATA_WATCHDOG) && (devpriv->b_TimerSelectMode != ADDIDATA_WATCHDOG)

70
drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
View file

@ -69,11 +69,11 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| for you call any other function witch access of TTL. | | for you call any other function witch access of TTL. |
| APCI16XX_TTL_INITDIRECTION(user inputs for direction) | | APCI16XX_TTL_INITDIRECTION(user inputs for direction) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : b_InitType = (BYTE) data[0]; | | Input Parameters : b_InitType = (unsigned char) data[0]; |
| b_Port0Mode = (BYTE) data[1]; | | b_Port0Mode = (unsigned char) data[1]; |
| b_Port1Mode = (BYTE) data[2]; | | b_Port1Mode = (unsigned char) data[2]; |
| b_Port2Mode = (BYTE) data[3]; | | b_Port2Mode = (unsigned char) data[3]; |
| b_Port3Mode = (BYTE) data[4]; | | b_Port3Mode = (unsigned char) data[4]; |
| ........ | | ........ |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
@ -94,10 +94,10 @@ int i_APCI16XX_InsnConfigInitTTLIO(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)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Command = 0; unsigned char b_Command = 0;
BYTE b_Cpt = 0; unsigned char b_Cpt = 0;
BYTE b_NumberOfPort = unsigned char b_NumberOfPort =
(BYTE) (devpriv->ps_BoardInfo->i_NbrTTLChannel / 8); (unsigned char) (devpriv->ps_BoardInfo->i_NbrTTLChannel / 8);
/************************/ /************************/
/* Test the buffer size */ /* Test the buffer size */
@ -108,7 +108,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev,
/* Get the command */ /* Get the command */
/* **************** */ /* **************** */
b_Command = (BYTE) data[0]; b_Command = (unsigned char) data[0];
/********************/ /********************/
/* Test the command */ /* Test the command */
@ -122,7 +122,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev,
/***************************************/ /***************************************/
if ((b_Command == APCI16XX_TTL_INITDIRECTION) if ((b_Command == APCI16XX_TTL_INITDIRECTION)
&& ((BYTE) (insn->n - 1) != b_NumberOfPort)) { && ((unsigned char) (insn->n - 1) != b_NumberOfPort)) {
/*******************/ /*******************/
/* Data size error */ /* Data size error */
/*******************/ /*******************/
@ -132,7 +132,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev,
} }
if ((b_Command == APCI16XX_TTL_OUTPUTMEMORY) if ((b_Command == APCI16XX_TTL_OUTPUTMEMORY)
&& ((BYTE) (insn->n) != 2)) { && ((unsigned char) (insn->n) != 2)) {
/*******************/ /*******************/
/* Data size error */ /* Data size error */
/*******************/ /*******************/
@ -266,11 +266,11 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev,
| APCI16XX_TTL_READCHANNEL | | APCI16XX_TTL_READCHANNEL |
| b_SelectedPort= CR_RANGE(insn->chanspec); | | b_SelectedPort= CR_RANGE(insn->chanspec); |
| b_InputChannel= CR_CHAN(insn->chanspec); | | b_InputChannel= CR_CHAN(insn->chanspec); |
| b_ReadType = (BYTE) data[0]; | | b_ReadType = (unsigned char) data[0]; |
| | | |
| APCI16XX_TTL_READPORT | | APCI16XX_TTL_READPORT |
| b_SelectedPort= CR_RANGE(insn->chanspec); | | b_SelectedPort= CR_RANGE(insn->chanspec); |
| b_ReadType = (BYTE) data[0]; | | b_ReadType = (unsigned char) data[0]; |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : data[0] 0 : Channle is not active | | Output Parameters : data[0] 0 : Channle is not active |
| 1 : Channle is active | | 1 : Channle is active |
@ -287,12 +287,12 @@ int i_APCI16XX_InsnBitsReadTTLIO(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)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Command = 0; unsigned char b_Command = 0;
BYTE b_NumberOfPort = unsigned char b_NumberOfPort =
(BYTE) (devpriv->ps_BoardInfo->i_NbrTTLChannel / 8); (unsigned char) (devpriv->ps_BoardInfo->i_NbrTTLChannel / 8);
BYTE b_SelectedPort = CR_RANGE(insn->chanspec); unsigned char b_SelectedPort = CR_RANGE(insn->chanspec);
BYTE b_InputChannel = CR_CHAN(insn->chanspec); unsigned char b_InputChannel = CR_CHAN(insn->chanspec);
BYTE *pb_Status; unsigned char *pb_Status;
DWORD dw_Status; DWORD dw_Status;
/************************/ /************************/
@ -304,7 +304,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev,
/* Get the command */ /* Get the command */
/* **************** */ /* **************** */
b_Command = (BYTE) data[0]; b_Command = (unsigned char) data[0];
/********************/ /********************/
/* Test the command */ /* Test the command */
@ -380,7 +380,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev,
/**************************/ /**************************/
if (i_ReturnValue >= 0) { if (i_ReturnValue >= 0) {
pb_Status = (PBYTE) & data[0]; pb_Status = (unsigned char *) & data[0];
/*******************************/ /*******************************/
/* Get the digital inpu status */ /* Get the digital inpu status */
@ -394,7 +394,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev,
/* Save the port value */ /* Save the port value */
/***********************/ /***********************/
*pb_Status = (BYTE) dw_Status; *pb_Status = (unsigned char) dw_Status;
/***************************************/ /***************************************/
/* Test if read channel status command */ /* Test if read channel status command */
@ -433,10 +433,10 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev,
int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev, int i_APCI16XX_InsnReadTTLIOAllPortValue(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)
{ {
BYTE b_Command = (BYTE) CR_AREF(insn->chanspec); unsigned char b_Command = (unsigned char) CR_AREF(insn->chanspec);
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Cpt = 0; unsigned char b_Cpt = 0;
BYTE b_NumberOfPort = 0; unsigned char b_NumberOfPort = 0;
unsigned int *pls_ReadData = data; unsigned int *pls_ReadData = data;
/********************/ /********************/
@ -450,7 +450,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev,
/**********************************/ /**********************************/
b_NumberOfPort = b_NumberOfPort =
(BYTE) (devpriv->ps_BoardInfo->i_NbrTTLChannel / 32); (unsigned char) (devpriv->ps_BoardInfo->i_NbrTTLChannel / 32);
if ((b_NumberOfPort * 32) < if ((b_NumberOfPort * 32) <
devpriv->ps_BoardInfo->i_NbrTTLChannel) { devpriv->ps_BoardInfo->i_NbrTTLChannel) {
b_NumberOfPort = b_NumberOfPort + 1; b_NumberOfPort = b_NumberOfPort + 1;
@ -551,11 +551,11 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev,
| APCI16XX_TTL_WRITECHANNEL_ON | APCI16XX_TTL_WRITECHANNEL_OFF | | APCI16XX_TTL_WRITECHANNEL_ON | APCI16XX_TTL_WRITECHANNEL_OFF |
| b_SelectedPort = CR_RANGE(insn->chanspec); | | b_SelectedPort = CR_RANGE(insn->chanspec); |
| b_OutputChannel= CR_CHAN(insn->chanspec); | | b_OutputChannel= CR_CHAN(insn->chanspec); |
| b_Command = (BYTE) data[0]; | | b_Command = (unsigned char) data[0]; |
| | | |
| APCI16XX_TTL_WRITEPORT_ON | APCI16XX_TTL_WRITEPORT_OFF | | APCI16XX_TTL_WRITEPORT_ON | APCI16XX_TTL_WRITEPORT_OFF |
| b_SelectedPort = CR_RANGE(insn->chanspec); | | b_SelectedPort = CR_RANGE(insn->chanspec); |
| b_Command = (BYTE) data[0]; | | b_Command = (unsigned char) data[0]; |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : data[0] : TTL output port 0 to 3 data | | Output Parameters : data[0] : TTL output port 0 to 3 data |
| data[1] : TTL output port 4 to 7 data | | data[1] : TTL output port 4 to 7 data |
@ -574,11 +574,11 @@ int i_APCI16XX_InsnBitsWriteTTLIO(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)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Command = 0; unsigned char b_Command = 0;
BYTE b_NumberOfPort = unsigned char b_NumberOfPort =
(BYTE) (devpriv->ps_BoardInfo->i_NbrTTLChannel / 8); (unsigned char) (devpriv->ps_BoardInfo->i_NbrTTLChannel / 8);
BYTE b_SelectedPort = CR_RANGE(insn->chanspec); unsigned char b_SelectedPort = CR_RANGE(insn->chanspec);
BYTE b_OutputChannel = CR_CHAN(insn->chanspec); unsigned char b_OutputChannel = CR_CHAN(insn->chanspec);
DWORD dw_Status = 0; DWORD dw_Status = 0;
/************************/ /************************/
@ -590,7 +590,7 @@ int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device * dev,
/* Get the command */ /* Get the command */
/* **************** */ /* **************** */
b_Command = (BYTE) data[0]; b_Command = (unsigned char) data[0];
/********************/ /********************/
/* Test the command */ /* Test the command */

16
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View file

@ -149,7 +149,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_sub
struct comedi_insn * insn, unsigned int * data) struct comedi_insn * insn, unsigned int * data)
{ {
USHORT us_ConvertTiming, us_TmpValue, i; USHORT us_ConvertTiming, us_TmpValue, i;
BYTE b_Tmp; unsigned char b_Tmp;
// fix convertion time to 10 us // fix convertion time to 10 us
if (!devpriv->ui_EocEosConversionTime) { if (!devpriv->ui_EocEosConversionTime) {
@ -710,7 +710,7 @@ int i_APCI3120_CommandAnalogInput(struct comedi_device * dev, struct comedi_subd
int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev, int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev,
struct comedi_subdevice * s) struct comedi_subdevice * s)
{ {
BYTE b_Tmp; unsigned char b_Tmp;
UINT ui_Tmp, ui_DelayTiming = 0, ui_TimerValue1 = 0, dmalen0 = UINT ui_Tmp, ui_DelayTiming = 0, ui_TimerValue1 = 0, dmalen0 =
0, dmalen1 = 0, ui_TimerValue2 = 0, dmalen1 = 0, ui_TimerValue2 =
0, ui_TimerValue0, ui_ConvertTiming; 0, ui_TimerValue0, ui_ConvertTiming;
@ -1426,7 +1426,7 @@ void v_APCI3120_Interrupt(int irq, void *d)
unsigned int int_amcc, ui_Check, i; unsigned int int_amcc, ui_Check, i;
USHORT us_TmpValue; USHORT us_TmpValue;
BYTE b_DummyRead; unsigned char b_DummyRead;
struct comedi_subdevice *s = dev->subdevices + 0; struct comedi_subdevice *s = dev->subdevices + 0;
ui_Check = 1; ui_Check = 1;
@ -1974,16 +1974,16 @@ int i_APCI3120_InsnConfigTimer(struct comedi_device * dev, struct comedi_subdevi
UINT ui_Timervalue2; UINT ui_Timervalue2;
USHORT us_TmpValue; USHORT us_TmpValue;
BYTE b_Tmp; unsigned char b_Tmp;
if (!data[1]) if (!data[1])
comedi_error(dev, "config:No timer constant !"); comedi_error(dev, "config:No timer constant !");
devpriv->b_Timer2Interrupt = (BYTE) data[2]; // save info whether to enable or disable interrupt devpriv->b_Timer2Interrupt = (unsigned char) data[2]; // save info whether to enable or disable interrupt
ui_Timervalue2 = data[1] / 1000; // convert nano seconds to u seconds ui_Timervalue2 = data[1] / 1000; // convert nano seconds to u seconds
//this_board->i_hwdrv_InsnConfigTimer(dev, ui_Timervalue2,(BYTE)data[0]); //this_board->i_hwdrv_InsnConfigTimer(dev, ui_Timervalue2,(unsigned char)data[0]);
us_TmpValue = (USHORT) inw(devpriv->iobase + APCI3120_RD_STATUS); us_TmpValue = (USHORT) inw(devpriv->iobase + APCI3120_RD_STATUS);
//EL250804: Testing if board APCI3120 have the new Quartz or if it is an APCI3001 //EL250804: Testing if board APCI3120 have the new Quartz or if it is an APCI3001
@ -2125,7 +2125,7 @@ int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, struct comedi_subdevic
UINT ui_Timervalue2 = 0; UINT ui_Timervalue2 = 0;
USHORT us_TmpValue; USHORT us_TmpValue;
BYTE b_Tmp; unsigned char b_Tmp;
if ((devpriv->b_Timer2Mode != APCI3120_WATCHDOG) if ((devpriv->b_Timer2Mode != APCI3120_WATCHDOG)
&& (devpriv->b_Timer2Mode != APCI3120_TIMER)) { && (devpriv->b_Timer2Mode != APCI3120_TIMER)) {
@ -2308,7 +2308,7 @@ int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, struct comedi_subdevic
int i_APCI3120_InsnReadTimer(struct comedi_device * dev, struct comedi_subdevice * s, int i_APCI3120_InsnReadTimer(struct comedi_device * dev, struct comedi_subdevice * s,
struct comedi_insn * insn, unsigned int * data) struct comedi_insn * insn, unsigned int * data)
{ {
BYTE b_Tmp; unsigned char b_Tmp;
USHORT us_TmpValue, us_TmpValue_2, us_StatusValue; USHORT us_TmpValue, us_TmpValue_2, us_StatusValue;
if ((devpriv->b_Timer2Mode != APCI3120_WATCHDOG) if ((devpriv->b_Timer2Mode != APCI3120_WATCHDOG)

8
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
View file

@ -166,10 +166,10 @@ static const struct comedi_lrange range_apci3120_ao = { 2, {
#define MAX_ANALOGINPUT_CHANNELS 32 #define MAX_ANALOGINPUT_CHANNELS 32
typedef struct { typedef struct {
BYTE b_Type; /* EOC or EOS */ unsigned char b_Type; /* EOC or EOS */
BYTE b_InterruptFlag; /* Interrupt use or not */ unsigned char b_InterruptFlag; /* Interrupt use or not */
UINT ui_ConvertTiming; /* Selection of the convertion time */ UINT ui_ConvertTiming; /* Selection of the convertion time */
BYTE b_NbrOfChannel; /* Number of channel to read */ unsigned char b_NbrOfChannel; /* Number of channel to read */
UINT ui_ChannelList[MAX_ANALOGINPUT_CHANNELS]; /* Number of the channel to be read */ UINT ui_ChannelList[MAX_ANALOGINPUT_CHANNELS]; /* Number of the channel to be read */
UINT ui_RangeList[MAX_ANALOGINPUT_CHANNELS]; /* Gain of each channel */ UINT ui_RangeList[MAX_ANALOGINPUT_CHANNELS]; /* Gain of each channel */
@ -214,7 +214,7 @@ int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, struct comedi_sub
struct comedi_insn *insn, unsigned int *data); struct comedi_insn *insn, unsigned int *data);
//DO //DO
//int i_APCI3120_WriteDigitalOutput(struct comedi_device *dev, BYTE data); //int i_APCI3120_WriteDigitalOutput(struct comedi_device *dev, unsigned char data);
int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev, int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_insn *insn, struct comedi_subdevice *s, struct comedi_insn *insn,
unsigned int *data); unsigned int *data);

10
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
View file

@ -118,11 +118,11 @@ INT i_AddiHeaderRW_ReadEeprom(INT i_NbOfWordsToRead,
INT i_Counter = 0; INT i_Counter = 0;
INT i_WordCounter; INT i_WordCounter;
INT i; INT i;
BYTE pb_ReadByte[1]; unsigned char pb_ReadByte[1];
BYTE b_ReadLowByte = 0; unsigned char b_ReadLowByte = 0;
BYTE b_ReadHighByte = 0; unsigned char b_ReadHighByte = 0;
BYTE b_SelectedAddressLow = 0; unsigned char b_SelectedAddressLow = 0;
BYTE b_SelectedAddressHigh = 0; unsigned char b_SelectedAddressHigh = 0;
WORD w_ReadWord = 0; WORD w_ReadWord = 0;
for (i_WordCounter = 0; i_WordCounter < i_NbOfWordsToRead; for (i_WordCounter = 0; i_WordCounter < i_NbOfWordsToRead;

2
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
View file

@ -137,7 +137,7 @@ typedef struct {
INT i_Initialised; INT i_Initialised;
//UINT ui_InterruptChannelValue[96]; //Buffer //UINT ui_InterruptChannelValue[96]; //Buffer
UINT ui_InterruptChannelValue[144]; //Buffer UINT ui_InterruptChannelValue[144]; //Buffer
BYTE b_StructInitialized; unsigned char b_StructInitialized;
//Begin JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 //Begin JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
unsigned int ui_ScanValueArray[7 + 12]; // 7 is the maximal number of channels unsigned int ui_ScanValueArray[7 + 12]; // 7 is the maximal number of channels
//End JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 //End JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68

60
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
View file

@ -87,8 +87,8 @@ int i_APCI3XXX_TestConversionStarted(struct comedi_device * dev)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task Converting mode and convert time selection | | Task Converting mode and convert time selection |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : b_SingleDiff = (BYTE) data[1]; | | Input Parameters : b_SingleDiff = (unsigned char) data[1]; |
| b_TimeBase = (BYTE) data[2]; (0: ns, 1:micros 2:ms)| | b_TimeBase = (unsigned char) data[2]; (0: ns, 1:micros 2:ms)|
| dw_ReloadValue = (DWORD) data[3]; | | dw_ReloadValue = (DWORD) data[3]; |
| ........ | | ........ |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -109,8 +109,8 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(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)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_TimeBase = 0; unsigned char b_TimeBase = 0;
BYTE b_SingleDiff = 0; unsigned char b_SingleDiff = 0;
DWORD dw_ReloadValue = 0; DWORD dw_ReloadValue = 0;
DWORD dw_TestReloadValue = 0; DWORD dw_TestReloadValue = 0;
@ -123,13 +123,13 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device * dev,
/* Get the Singel/Diff flag */ /* Get the Singel/Diff flag */
/****************************/ /****************************/
b_SingleDiff = (BYTE) data[1]; b_SingleDiff = (unsigned char) data[1];
/****************************/ /****************************/
/* Get the time base unitiy */ /* Get the time base unitiy */
/****************************/ /****************************/
b_TimeBase = (BYTE) data[2]; b_TimeBase = (unsigned char) data[2];
/*************************************/ /*************************************/
/* Get the convert time reload value */ /* Get the convert time reload value */
@ -281,8 +281,8 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task Converting mode and convert time selection | | Task Converting mode and convert time selection |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : b_ConvertMode = (BYTE) data[0]; | | Input Parameters : b_ConvertMode = (unsigned char) data[0]; |
| b_TimeBase = (BYTE) data[1]; (0: ns, 1:micros 2:ms)| | b_TimeBase = (unsigned char) data[1]; (0: ns, 1:micros 2:ms)|
| dw_ReloadValue = (DWORD) data[2]; | | dw_ReloadValue = (DWORD) data[2]; |
| ........ | | ........ |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -305,7 +305,7 @@ int i_APCI3XXX_InsnConfigAnalogInput(struct comedi_device * dev,
/************************/ /************************/
if (insn->n >= 1) { if (insn->n >= 1) {
switch ((BYTE) data[0]) { switch ((unsigned char) data[0]) {
case APCI3XXX_CONFIGURATION: case APCI3XXX_CONFIGURATION:
i_ReturnValue = i_ReturnValue =
i_APCI3XXX_AnalogInputConfigOperatingMode(dev, i_APCI3XXX_AnalogInputConfigOperatingMode(dev,
@ -359,12 +359,12 @@ int i_APCI3XXX_InsnReadAnalogInput(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)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Configuration = (BYTE) CR_RANGE(insn->chanspec); unsigned char b_Configuration = (unsigned char) CR_RANGE(insn->chanspec);
BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec); unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
DWORD dw_Temp = 0; DWORD dw_Temp = 0;
DWORD dw_Configuration = 0; DWORD dw_Configuration = 0;
DWORD dw_AcquisitionCpt = 0; DWORD dw_AcquisitionCpt = 0;
BYTE b_Interrupt = 0; unsigned char b_Interrupt = 0;
/*************************************/ /*************************************/
/* Test if operating mode configured */ /* Test if operating mode configured */
@ -607,7 +607,7 @@ int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device * dev,
void v_APCI3XXX_Interrupt(int irq, void *d) void v_APCI3XXX_Interrupt(int irq, void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
BYTE b_CopyCpt = 0; unsigned char b_CopyCpt = 0;
DWORD dw_Status = 0; DWORD dw_Status = 0;
/***************************/ /***************************/
@ -687,8 +687,8 @@ void v_APCI3XXX_Interrupt(int irq, void *d)
int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device * dev, int i_APCI3XXX_InsnWriteAnalogOutput(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)
{ {
BYTE b_Range = (BYTE) CR_RANGE(insn->chanspec); unsigned char b_Range = (unsigned char) CR_RANGE(insn->chanspec);
BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec); unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
DWORD dw_Status = 0; DWORD dw_Status = 0;
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -778,8 +778,8 @@ int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device * dev,
| for you call any other function witch access of TTL. | | for you call any other function witch access of TTL. |
| APCI3XXX_TTL_INIT_DIRECTION_PORT2(user inputs for direction)| | APCI3XXX_TTL_INIT_DIRECTION_PORT2(user inputs for direction)|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : b_InitType = (BYTE) data[0]; | | Input Parameters : b_InitType = (unsigned char) data[0]; |
| b_Port2Mode = (BYTE) data[1]; | | b_Port2Mode = (unsigned char) data[1]; |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -795,7 +795,7 @@ int i_APCI3XXX_InsnConfigInitTTLIO(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)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Command = 0; unsigned char b_Command = 0;
/************************/ /************************/
/* Test the buffer size */ /* Test the buffer size */
@ -806,7 +806,7 @@ int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device * dev,
/* Get the command */ /* Get the command */
/* **************** */ /* **************** */
b_Command = (BYTE) data[0]; b_Command = (unsigned char) data[0];
/********************/ /********************/
/* Test the command */ /* Test the command */
@ -923,7 +923,7 @@ int i_APCI3XXX_InsnBitsTTLIO(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)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_ChannelCpt = 0; unsigned char b_ChannelCpt = 0;
DWORD dw_ChannelMask = 0; DWORD dw_ChannelMask = 0;
DWORD dw_BitMask = 0; DWORD dw_BitMask = 0;
DWORD dw_Status = 0; DWORD dw_Status = 0;
@ -1077,7 +1077,7 @@ int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device * dev,
int i_APCI3XXX_InsnReadTTLIO(struct comedi_device * dev, int i_APCI3XXX_InsnReadTTLIO(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)
{ {
BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec); unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
unsigned int *pls_ReadData = data; unsigned int *pls_ReadData = data;
@ -1191,8 +1191,8 @@ int i_APCI3XXX_InsnWriteTTLIO(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)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec); unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
BYTE b_State = 0; unsigned char b_State = 0;
DWORD dw_Status = 0; DWORD dw_Status = 0;
/************************/ /************************/
@ -1200,7 +1200,7 @@ int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device * dev,
/************************/ /************************/
if (insn->n >= 1) { if (insn->n >= 1) {
b_State = (BYTE) data[0]; b_State = (unsigned char) data[0];
/***********************/ /***********************/
/* Test if read port 0 */ /* Test if read port 0 */
@ -1302,7 +1302,7 @@ int i_APCI3XXX_InsnReadDigitalInput(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)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec); unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
DWORD dw_Temp = 0; DWORD dw_Temp = 0;
/***************************/ /***************************/
@ -1413,7 +1413,7 @@ int i_APCI3XXX_InsnBitsDigitalOutput(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)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_ChannelCpt = 0; unsigned char b_ChannelCpt = 0;
DWORD dw_ChannelMask = 0; DWORD dw_ChannelMask = 0;
DWORD dw_BitMask = 0; DWORD dw_BitMask = 0;
DWORD dw_Status = 0; DWORD dw_Status = 0;
@ -1509,8 +1509,8 @@ int i_APCI3XXX_InsnWriteDigitalOutput(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)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Channel = CR_CHAN(insn->chanspec); unsigned char b_Channel = CR_CHAN(insn->chanspec);
BYTE b_State = 0; unsigned char b_State = 0;
DWORD dw_Status = 0; DWORD dw_Status = 0;
/************************/ /************************/
@ -1527,7 +1527,7 @@ int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device * dev,
/* Get the command */ /* Get the command */
/*******************/ /*******************/
b_State = (BYTE) data[0]; b_State = (unsigned char) data[0];
/********************************/ /********************************/
/* Read the digital output port */ /* Read the digital output port */
@ -1584,7 +1584,7 @@ int i_APCI3XXX_InsnReadDigitalOutput(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)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Channel = CR_CHAN(insn->chanspec); unsigned char b_Channel = CR_CHAN(insn->chanspec);
DWORD dw_Status = 0; DWORD dw_Status = 0;
/************************/ /************************/