[PATCH 041/342] Staging: comedi: remove C99 comments in hwdrv_apci3200.c
Greg Kroah-Hartman
gregkh at suse.de
Fri Jun 19 18:04:25 UTC 2009
From: Bill Pemberton <wfp5p at virginia.edu>
Signed-off-by: Bill Pemberton <wfp5p at virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
.../comedi/drivers/addi-data/hwdrv_apci3200.c | 1338 ++++++++++----------
1 files changed, 669 insertions(+), 669 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
index 64dc68c..8981b0f 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -57,21 +57,21 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+
*/
#include "hwdrv_apci3200.h"
-//Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+/* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
#include "addi_amcc_S5920.h"
-//#define PRINT_INFO
+/* #define PRINT_INFO */
-//End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+/* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
-//BEGIN JK 06.07.04: Management of sevrals boards
+/* BEGIN JK 06.07.04: Management of sevrals boards */
/*
int i_CJCAvailable=1;
int i_CJCPolarity=0;
- int i_CJCGain=2;//changed from 0 to 2
+ int i_CJCGain=2;/* changed from 0 to 2 */
int i_InterruptFlag=0;
int i_ADDIDATAPolarity;
int i_ADDIDATAGain;
- int i_AutoCalibration=0; //: auto calibration
+ int i_AutoCalibration=0; /* : auto calibration */
int i_ADDIDATAConversionTime;
int i_ADDIDATAConversionTimeUnit;
int i_ADDIDATAType;
@@ -85,12 +85,12 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
unsigned int ui_Channel_num=0;
static int i_Count=0;
int i_Initialised=0;
- unsigned int ui_InterruptChannelValue[96]; //Buffer
+ unsigned int ui_InterruptChannelValue[96]; /* Buffer */
*/
-struct str_BoardInfos s_BoardInfos[100]; // 100 will be the max number of boards to be used
-//END JK 06.07.04: Management of sevrals boards
+struct str_BoardInfos s_BoardInfos[100]; /* 100 will be the max number of boards to be used */
+/* END JK 06.07.04: Management of sevrals boards */
-//Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+/* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
/*+----------------------------------------------------------------------------+*/
/*| Function Name : int i_AddiHeaderRW_ReadEeprom |*/
@@ -136,15 +136,15 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
while (dw_eeprom_busy == EEPROM_BUSY);
for (i_Counter = 0; i_Counter < 2; i_Counter++) {
- b_SelectedAddressLow = (w_EepromStartAddress + i_Counter) % 256; //Read the low 8 bit part
- b_SelectedAddressHigh = (w_EepromStartAddress + i_Counter) / 256; //Read the high 8 bit part
+ b_SelectedAddressLow = (w_EepromStartAddress + i_Counter) % 256; /* Read the low 8 bit part */
+ b_SelectedAddressHigh = (w_EepromStartAddress + i_Counter) / 256; /* Read the high 8 bit part */
- //Select the load low address mode
+ /* Select the load low address mode */
outb(NVCMD_LOAD_LOW,
dw_PCIBoardEepromAddress + AMCC_OP_REG_MCSR +
3);
- //Wait on busy
+ /* Wait on busy */
do {
dw_eeprom_busy =
inl(dw_PCIBoardEepromAddress +
@@ -153,12 +153,12 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
}
while (dw_eeprom_busy == EEPROM_BUSY);
- //Load the low address
+ /* Load the low address */
outb(b_SelectedAddressLow,
dw_PCIBoardEepromAddress + AMCC_OP_REG_MCSR +
2);
- //Wait on busy
+ /* Wait on busy */
do {
dw_eeprom_busy =
inl(dw_PCIBoardEepromAddress +
@@ -167,12 +167,12 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
}
while (dw_eeprom_busy == EEPROM_BUSY);
- //Select the load high address mode
+ /* Select the load high address mode */
outb(NVCMD_LOAD_HIGH,
dw_PCIBoardEepromAddress + AMCC_OP_REG_MCSR +
3);
- //Wait on busy
+ /* Wait on busy */
do {
dw_eeprom_busy =
inl(dw_PCIBoardEepromAddress +
@@ -181,12 +181,12 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
}
while (dw_eeprom_busy == EEPROM_BUSY);
- //Load the high address
+ /* Load the high address */
outb(b_SelectedAddressHigh,
dw_PCIBoardEepromAddress + AMCC_OP_REG_MCSR +
2);
- //Wait on busy
+ /* Wait on busy */
do {
dw_eeprom_busy =
inl(dw_PCIBoardEepromAddress +
@@ -195,12 +195,12 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
}
while (dw_eeprom_busy == EEPROM_BUSY);
- //Select the READ mode
+ /* Select the READ mode */
outb(NVCMD_BEGIN_READ,
dw_PCIBoardEepromAddress + AMCC_OP_REG_MCSR +
3);
- //Wait on busy
+ /* Wait on busy */
do {
dw_eeprom_busy =
inl(dw_PCIBoardEepromAddress +
@@ -209,12 +209,12 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
}
while (dw_eeprom_busy == EEPROM_BUSY);
- //Read data into the EEPROM
+ /* Read data into the EEPROM */
*pb_ReadByte =
inb(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR + 2);
- //Wait on busy
+ /* Wait on busy */
do {
dw_eeprom_busy =
inl(dw_PCIBoardEepromAddress +
@@ -223,14 +223,14 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
}
while (dw_eeprom_busy == EEPROM_BUSY);
- //Select the upper address part
+ /* Select the upper address part */
if (i_Counter == 0) {
b_ReadLowByte = pb_ReadByte[0];
} else {
b_ReadHighByte = pb_ReadByte[0];
}
- //Sleep
+ /* Sleep */
for (i = 0; i < 10000; i++) ;
}
@@ -240,9 +240,9 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
pw_DataRead[i_WordCounter] = w_ReadWord;
- w_EepromStartAddress += 2; // to read the next word
+ w_EepromStartAddress += 2; /* to read the next word */
- } // for (...) i_NbOfWordsToRead
+ } /* for (...) i_NbOfWordsToRead */
return (0);
}
@@ -281,8 +281,8 @@ void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
/*****************************************/
/** Get the Analog input header address **/
/*****************************************/
- i_AddiHeaderRW_ReadEeprom(1, //i_NbOfWordsToRead
- dw_PCIBoardEepromAddress, 0x116, //w_EepromStartAddress: Analog input header address
+ i_AddiHeaderRW_ReadEeprom(1, /* i_NbOfWordsToRead */
+ dw_PCIBoardEepromAddress, 0x116, /* w_EepromStartAddress: Analog input header address */
&w_AnalogInputMainHeaderAddress);
/*******************************************/
@@ -293,8 +293,8 @@ void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
/******************************/
/** Get the number of moduls **/
/******************************/
- i_AddiHeaderRW_ReadEeprom(1, //i_NbOfWordsToRead
- dw_PCIBoardEepromAddress, w_AnalogInputMainHeaderAddress + 0x02, //w_EepromStartAddress: Number of conponment
+ i_AddiHeaderRW_ReadEeprom(1, /* i_NbOfWordsToRead */
+ dw_PCIBoardEepromAddress, w_AnalogInputMainHeaderAddress + 0x02, /* w_EepromStartAddress: Number of conponment */
&w_NumberOfModuls);
for (w_ModulCounter = 0; w_ModulCounter < w_NumberOfModuls;
@@ -309,8 +309,8 @@ void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
/****************************/
/** Read first header size **/
/****************************/
- i_AddiHeaderRW_ReadEeprom(1, //i_NbOfWordsToRead
- dw_PCIBoardEepromAddress, w_AnalogInputComponentAddress, // Address of the first header
+ i_AddiHeaderRW_ReadEeprom(1, /* i_NbOfWordsToRead */
+ dw_PCIBoardEepromAddress, w_AnalogInputComponentAddress, /* Address of the first header */
&w_FirstHeaderSize);
w_FirstHeaderSize = w_FirstHeaderSize >> 4;
@@ -318,8 +318,8 @@ void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
/***************************/
/** Read number of inputs **/
/***************************/
- i_AddiHeaderRW_ReadEeprom(1, //i_NbOfWordsToRead
- dw_PCIBoardEepromAddress, w_AnalogInputComponentAddress + 0x06, // Number of inputs for the first modul
+ i_AddiHeaderRW_ReadEeprom(1, /* i_NbOfWordsToRead */
+ dw_PCIBoardEepromAddress, w_AnalogInputComponentAddress + 0x06, /* Number of inputs for the first modul */
&w_NumberOfInputs);
w_NumberOfInputs = w_NumberOfInputs >> 4;
@@ -327,17 +327,17 @@ void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
/***********************/
/** Read the CJC flag **/
/***********************/
- i_AddiHeaderRW_ReadEeprom(1, //i_NbOfWordsToRead
- dw_PCIBoardEepromAddress, w_AnalogInputComponentAddress + 0x08, // CJC flag
+ i_AddiHeaderRW_ReadEeprom(1, /* i_NbOfWordsToRead */
+ dw_PCIBoardEepromAddress, w_AnalogInputComponentAddress + 0x08, /* CJC flag */
&w_CJCFlag);
- w_CJCFlag = (w_CJCFlag >> 3) & 0x1; // Get only the CJC flag
+ w_CJCFlag = (w_CJCFlag >> 3) & 0x1; /* Get only the CJC flag */
/*******************************/
/** Read number of gain value **/
/*******************************/
- i_AddiHeaderRW_ReadEeprom(1, //i_NbOfWordsToRead
- dw_PCIBoardEepromAddress, w_AnalogInputComponentAddress + 0x44, // Number of gain value
+ i_AddiHeaderRW_ReadEeprom(1, /* i_NbOfWordsToRead */
+ dw_PCIBoardEepromAddress, w_AnalogInputComponentAddress + 0x44, /* Number of gain value */
&w_NumberOfGainValue);
w_NumberOfGainValue = w_NumberOfGainValue & 0xFF;
@@ -354,8 +354,8 @@ void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
/********************************************/
/** Read current sources value for input 1 **/
/********************************************/
- i_AddiHeaderRW_ReadEeprom(1, //i_NbOfWordsToRead
- dw_PCIBoardEepromAddress, w_SingleHeaderAddress, //w_EepromStartAddress: Single header address
+ i_AddiHeaderRW_ReadEeprom(1, /* i_NbOfWordsToRead */
+ dw_PCIBoardEepromAddress, w_SingleHeaderAddress, /* w_EepromStartAddress: Single header address */
&w_SingleHeaderSize);
w_SingleHeaderSize = w_SingleHeaderSize >> 4;
@@ -370,8 +370,8 @@ void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
/************************************/
/** Read gain value for the module **/
/************************************/
- i_AddiHeaderRW_ReadEeprom(1, //i_NbOfWordsToRead
- dw_PCIBoardEepromAddress, w_AnalogInputComponentAddress + 70 + (2 * (1 + (w_NumberOfGainValue / 16))) + (0x02 * w_GainIndex), // Gain value
+ i_AddiHeaderRW_ReadEeprom(1, /* i_NbOfWordsToRead */
+ dw_PCIBoardEepromAddress, w_AnalogInputComponentAddress + 70 + (2 * (1 + (w_NumberOfGainValue / 16))) + (0x02 * w_GainIndex), /* Gain value */
&w_GainValue);
BoardInformations->s_Module[w_ModulCounter].
@@ -386,8 +386,8 @@ void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
/*************************************/
/** Read gain factor for the module **/
/*************************************/
- i_AddiHeaderRW_ReadEeprom(2, //i_NbOfWordsToRead
- dw_PCIBoardEepromAddress, w_AnalogInputComponentAddress + 70 + ((2 * w_NumberOfGainValue) + (2 * (1 + (w_NumberOfGainValue / 16)))) + (0x04 * w_GainIndex), // Gain factor
+ i_AddiHeaderRW_ReadEeprom(2, /* i_NbOfWordsToRead */
+ dw_PCIBoardEepromAddress, w_AnalogInputComponentAddress + 70 + ((2 * w_NumberOfGainValue) + (2 * (1 + (w_NumberOfGainValue / 16)))) + (0x04 * w_GainIndex), /* Gain factor */
w_GainFactorValue);
BoardInformations->s_Module[w_ModulCounter].
@@ -409,7 +409,7 @@ void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
/********************************************/
/** Read current sources value for input 1 **/
/********************************************/
- i_AddiHeaderRW_ReadEeprom(2, //i_NbOfWordsToRead
+ i_AddiHeaderRW_ReadEeprom(2, /* i_NbOfWordsToRead */
dw_PCIBoardEepromAddress,
(w_Input * w_SingleHeaderSize) +
w_SingleHeaderAddress + 0x0C, w_CurrentSources);
@@ -432,7 +432,7 @@ void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress,
/***************************************/
/** Read the CJC current source value **/
/***************************************/
- i_AddiHeaderRW_ReadEeprom(2, //i_NbOfWordsToRead
+ i_AddiHeaderRW_ReadEeprom(2, /* i_NbOfWordsToRead */
dw_PCIBoardEepromAddress,
(w_Input * w_SingleHeaderSize) + w_SingleHeaderAddress +
0x0C, w_CurrentSources);
@@ -464,9 +464,9 @@ int i_APCI3200_GetChannelCalibrationValue(struct comedi_device * dev,
printk("\n Channel = %u", ui_Channel_num);
#endif
- //Test if single or differential mode
+ /* Test if single or differential mode */
if (s_BoardInfos[dev->minor].i_ConnectionType == 1) {
- //if diff
+ /* if diff */
if ((ui_Channel_num >= 0) && (ui_Channel_num <= 1))
i_DiffChannel = ui_Channel_num, i_Module = 0;
@@ -478,7 +478,7 @@ int i_APCI3200_GetChannelCalibrationValue(struct comedi_device * dev,
i_DiffChannel = ui_Channel_num - 6, i_Module = 3;
} else {
- // if single
+ /* if single */
if ((ui_Channel_num == 0) || (ui_Channel_num == 1))
i_DiffChannel = 0, i_Module = 0;
else if ((ui_Channel_num == 2) || (ui_Channel_num == 3))
@@ -497,7 +497,7 @@ int i_APCI3200_GetChannelCalibrationValue(struct comedi_device * dev,
i_DiffChannel = 1, i_Module = 3;
}
- //Test if thermocouple or RTD mode
+ /* Test if thermocouple or RTD mode */
*CJCCurrentSource =
s_BoardInfos[dev->minor].s_Module[i_Module].ul_CurrentSourceCJC;
#ifdef PRINT_INFO
@@ -510,22 +510,22 @@ int i_APCI3200_GetChannelCalibrationValue(struct comedi_device * dev,
#ifdef PRINT_INFO
printk("\n ChannelCurrentSource = %lu", *ChannelCurrentSource);
#endif
- // }
- // }
+ /* } */
+ /* } */
- //Channle gain factor
+ /* Channle gain factor */
*ChannelGainFactor =
s_BoardInfos[dev->minor].s_Module[i_Module].
ul_GainFactor[s_BoardInfos[dev->minor].i_ADDIDATAGain];
#ifdef PRINT_INFO
printk("\n ChannelGainFactor = %lu", *ChannelGainFactor);
#endif
- //End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
return (0);
}
-//End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+/* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
/*
+----------------------------------------------------------------------------+
@@ -561,13 +561,13 @@ int i_APCI3200_ReadDigitalInput(struct comedi_device * dev, struct comedi_subdev
if (ui_Temp == 0) {
*data = (*data >> ui_NoOfChannel) & 0x1;
- } //if (ui_Temp==0)
+ } /* if (ui_Temp==0) */
else {
if (ui_Temp == 1) {
if (data[1] < 0 || data[1] > 1) {
printk("\nThe port number is in error\n");
return -EINVAL;
- } //if(data[1] < 0 || data[1] >1)
+ } /* if(data[1] < 0 || data[1] >1) */
switch (ui_NoOfChannel) {
case 2:
@@ -578,13 +578,13 @@ int i_APCI3200_ReadDigitalInput(struct comedi_device * dev, struct comedi_subdev
break;
default:
comedi_error(dev, " chan spec wrong");
- return -EINVAL; // "sorry channel spec wrong "
+ return -EINVAL; /* "sorry channel spec wrong " */
- } //switch(ui_NoOfChannels)
- } //if (ui_Temp==1)
+ } /* switch(ui_NoOfChannels) */
+ } /* if (ui_Temp==1) */
else {
printk("\nSpecified channel not supported \n");
- } //elseif (ui_Temp==1)
+ } /* elseif (ui_Temp==1) */
}
return insn->n;
}
@@ -616,13 +616,13 @@ int i_APCI3200_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub
comedi_error(dev,
"Not a valid Data !!! ,Data should be 1 or 0\n");
return -EINVAL;
- } //if ( (data[0]!=0) && (data[0]!=1) )
+ } /* if ( (data[0]!=0) && (data[0]!=1) ) */
if (data[0]) {
devpriv->b_OutputMemoryStatus = ADDIDATA_ENABLE;
- } // if (data[0])
+ } /* if (data[0]) */
else {
devpriv->b_OutputMemoryStatus = ADDIDATA_DISABLE;
- } //else if (data[0])
+ } /* else if (data[0]) */
return insn->n;
}
@@ -657,19 +657,19 @@ int i_APCI3200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
struct comedi_insn * insn, unsigned int * data)
{
unsigned int ui_Temp = 0, ui_Temp1 = 0;
- unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); // get the channel
+ unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); /* get the channel */
if (devpriv->b_OutputMemoryStatus) {
ui_Temp = inl(devpriv->i_IobaseAddon);
- } //if(devpriv->b_OutputMemoryStatus )
+ } /* if(devpriv->b_OutputMemoryStatus ) */
else {
ui_Temp = 0;
- } //if(devpriv->b_OutputMemoryStatus )
+ } /* if(devpriv->b_OutputMemoryStatus ) */
if (data[3] == 0) {
if (data[1] == 0) {
data[0] = (data[0] << ui_NoOfChannel) | ui_Temp;
outl(data[0], devpriv->i_IobaseAddon);
- } //if(data[1]==0)
+ } /* if(data[1]==0) */
else {
if (data[1] == 1) {
switch (ui_NoOfChannel) {
@@ -682,15 +682,15 @@ int i_APCI3200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
case 3:
data[0] = (data[0] | ui_Temp);
break;
- } //switch(ui_NoOfChannels)
+ } /* switch(ui_NoOfChannels) */
outl(data[0], devpriv->i_IobaseAddon);
- } // if(data[1]==1)
+ } /* if(data[1]==1) */
else {
printk("\nSpecified channel not supported\n");
- } //else if(data[1]==1)
- } //elseif(data[1]==0)
- } //if(data[3]==0)
+ } /* else if(data[1]==1) */
+ } /* elseif(data[1]==0) */
+ } /* if(data[3]==0) */
else {
if (data[3] == 1) {
if (data[1] == 0) {
@@ -701,7 +701,7 @@ int i_APCI3200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
data[0] = (data[0] << ui_NoOfChannel) ^ 0xf;
data[0] = data[0] & ui_Temp;
outl(data[0], devpriv->i_IobaseAddon);
- } //if(data[1]==0)
+ } /* if(data[1]==0) */
else {
if (data[1] == 1) {
switch (ui_NoOfChannel) {
@@ -725,21 +725,21 @@ int i_APCI3200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd
default:
comedi_error(dev,
" chan spec wrong");
- return -EINVAL; // "sorry channel spec wrong "
- } //switch(ui_NoOfChannels)
+ return -EINVAL; /* "sorry channel spec wrong " */
+ } /* switch(ui_NoOfChannels) */
outl(data[0], devpriv->i_IobaseAddon);
- } // if(data[1]==1)
+ } /* if(data[1]==1) */
else {
printk("\nSpecified channel not supported\n");
- } //else if(data[1]==1)
- } //elseif(data[1]==0)
- } //if(data[3]==1);
+ } /* else if(data[1]==1) */
+ } /* elseif(data[1]==0) */
+ } /* if(data[3]==1); */
else {
printk("\nSpecified functionality does not exist\n");
return -EINVAL;
- } //if else data[3]==1)
- } //if else data[3]==0)
+ } /* if else data[3]==1) */
+ } /* if else data[3]==0) */
return insn->n;
}
@@ -776,13 +776,13 @@ int i_APCI3200_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde
*data = inl(devpriv->i_IobaseAddon);
if (ui_Temp == 0) {
*data = (*data >> ui_NoOfChannel) & 0x1;
- } // if (ui_Temp==0)
+ } /* if (ui_Temp==0) */
else {
if (ui_Temp == 1) {
if (data[1] < 0 || data[1] > 1) {
printk("\nThe port selection is in error\n");
return -EINVAL;
- } //if(data[1] <0 ||data[1] >1)
+ } /* if(data[1] <0 ||data[1] >1) */
switch (ui_NoOfChannel) {
case 2:
*data = (*data >> (2 * data[1])) & 3;
@@ -793,14 +793,14 @@ int i_APCI3200_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde
default:
comedi_error(dev, " chan spec wrong");
- return -EINVAL; // "sorry channel spec wrong "
+ return -EINVAL; /* "sorry channel spec wrong " */
break;
- } // switch(ui_NoOfChannels)
- } // if (ui_Temp==1)
+ } /* switch(ui_NoOfChannels) */
+ } /* if (ui_Temp==1) */
else {
printk("\nSpecified channel not supported \n");
- } // else if (ui_Temp==1)
- } // else if (ui_Temp==0)
+ } /* else if (ui_Temp==1) */
+ } /* else if (ui_Temp==0) */
return insn->n;
}
@@ -883,21 +883,21 @@ int i_APCI3200_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subde
unsigned int ui_Dummy = 0;
int i_err = 0;
- //Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
#ifdef PRINT_INFO
int i = 0, i2 = 0;
#endif
- //End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
- //BEGIN JK 06.07.04: Management of sevrals boards
- // Initialize the structure
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* Initialize the structure */
if (s_BoardInfos[dev->minor].b_StructInitialized != 1) {
s_BoardInfos[dev->minor].i_CJCAvailable = 1;
s_BoardInfos[dev->minor].i_CJCPolarity = 0;
- s_BoardInfos[dev->minor].i_CJCGain = 2; //changed from 0 to 2
+ s_BoardInfos[dev->minor].i_CJCGain = 2; /* changed from 0 to 2 */
s_BoardInfos[dev->minor].i_InterruptFlag = 0;
- s_BoardInfos[dev->minor].i_AutoCalibration = 0; //: auto calibration
+ s_BoardInfos[dev->minor].i_AutoCalibration = 0; /* : auto calibration */
s_BoardInfos[dev->minor].i_ChannelCount = 0;
s_BoardInfos[dev->minor].i_Sum = 0;
s_BoardInfos[dev->minor].ui_Channel_num = 0;
@@ -905,11 +905,11 @@ int i_APCI3200_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subde
s_BoardInfos[dev->minor].i_Initialised = 0;
s_BoardInfos[dev->minor].b_StructInitialized = 1;
- //Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
s_BoardInfos[dev->minor].i_ConnectionType = 0;
- //End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
- //Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* Begin JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
memset(s_BoardInfos[dev->minor].s_Module, 0,
sizeof(s_BoardInfos[dev->minor].s_Module[MAX_MODULE]));
@@ -938,72 +938,72 @@ int i_APCI3200_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subde
}
}
#endif
- //End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* End JK 21.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
}
if (data[0] != 0 && data[0] != 1 && data[0] != 2) {
printk("\nThe selection of acquisition type is in error\n");
i_err++;
- } //if(data[0]!=0 && data[0]!=1 && data[0]!=2)
+ } /* if(data[0]!=0 && data[0]!=1 && data[0]!=2) */
if (data[0] == 1) {
if (data[14] != 0 && data[14] != 1 && data[14] != 2
&& data[14] != 4) {
printk("\n Error in selection of RTD connection type\n");
i_err++;
- } //if(data[14]!=0 && data[14]!=1 && data[14]!=2 && data[14]!=4)
- } //if(data[0]==1 )
+ } /* if(data[14]!=0 && data[14]!=1 && data[14]!=2 && data[14]!=4) */
+ } /* if(data[0]==1 ) */
if (data[1] < 0 || data[1] > 7) {
printk("\nThe selection of gain is in error\n");
i_err++;
- } // if(data[1]<0 || data[1]>7)
+ } /* if(data[1]<0 || data[1]>7) */
if (data[2] != 0 && data[2] != 1) {
printk("\nThe selection of polarity is in error\n");
i_err++;
- } //if(data[2]!=0 && data[2]!=1)
+ } /* if(data[2]!=0 && data[2]!=1) */
if (data[3] != 0) {
printk("\nThe selection of offset range is in error\n");
i_err++;
- } // if(data[3]!=0)
+ } /* if(data[3]!=0) */
if (data[4] != 0 && data[4] != 1) {
printk("\nThe selection of coupling is in error\n");
i_err++;
- } //if(data[4]!=0 && data[4]!=1)
+ } /* if(data[4]!=0 && data[4]!=1) */
if (data[5] != 0 && data[5] != 1) {
printk("\nThe selection of single/differential mode is in error\n");
i_err++;
- } //if(data[5]!=0 && data[5]!=1)
+ } /* if(data[5]!=0 && data[5]!=1) */
if (data[8] != 0 && data[8] != 1 && data[2] != 2) {
printk("\nError in selection of functionality\n");
- } //if(data[8]!=0 && data[8]!=1 && data[2]!=2)
+ } /* if(data[8]!=0 && data[8]!=1 && data[2]!=2) */
if (data[12] == 0 || data[12] == 1) {
if (data[6] != 20 && data[6] != 40 && data[6] != 80
&& data[6] != 160) {
printk("\nThe selection of conversion time reload value is in error\n");
i_err++;
- } // if (data[6]!=20 && data[6]!=40 && data[6]!=80 && data[6]!=160 )
+ } /* if (data[6]!=20 && data[6]!=40 && data[6]!=80 && data[6]!=160 ) */
if (data[7] != 2) {
printk("\nThe selection of conversion time unit is in error\n");
i_err++;
- } // if(data[7]!=2)
+ } /* if(data[7]!=2) */
}
if (data[9] != 0 && data[9] != 1) {
printk("\nThe selection of interrupt enable is in error\n");
i_err++;
- } //if(data[9]!=0 && data[9]!=1)
+ } /* if(data[9]!=0 && data[9]!=1) */
if (data[11] < 0 || data[11] > 4) {
printk("\nThe selection of module is in error\n");
i_err++;
- } //if(data[11] <0 || data[11]>1)
+ } /* if(data[11] <0 || data[11]>1) */
if (data[12] < 0 || data[12] > 3) {
printk("\nThe selection of singlechannel/scan selection is in error\n");
i_err++;
- } //if(data[12] < 0 || data[12]> 3)
+ } /* if(data[12] < 0 || data[12]> 3) */
if (data[13] < 0 || data[13] > 16) {
printk("\nThe selection of number of channels is in error\n");
i_err++;
- } // if(data[13] <0 ||data[13] >15)
+ } /* if(data[13] <0 ||data[13] >15) */
- //BEGIN JK 06.07.04: Management of sevrals boards
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
/*
i_ChannelCount=data[13];
i_ScanType=data[12];
@@ -1014,7 +1014,7 @@ int i_APCI3200_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subde
i_ADDIDATAType=data[0];
*/
- // Save acquisition configuration for the actual board
+ /* Save acquisition configuration for the actual board */
s_BoardInfos[dev->minor].i_ChannelCount = data[13];
s_BoardInfos[dev->minor].i_ScanType = data[12];
s_BoardInfos[dev->minor].i_ADDIDATAPolarity = data[2];
@@ -1022,307 +1022,307 @@ int i_APCI3200_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subde
s_BoardInfos[dev->minor].i_ADDIDATAConversionTime = data[6];
s_BoardInfos[dev->minor].i_ADDIDATAConversionTimeUnit = data[7];
s_BoardInfos[dev->minor].i_ADDIDATAType = data[0];
- //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 */
s_BoardInfos[dev->minor].i_ConnectionType = data[5];
- //End JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
- //END JK 06.07.04: Management of sevrals boards
+ /* End JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+ /* END JK 06.07.04: Management of sevrals boards */
- //Begin JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
- memset(s_BoardInfos[dev->minor].ui_ScanValueArray, 0, (7 + 12) * sizeof(unsigned int)); // 7 is the maximal number of channels
- //End 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 */
+ memset(s_BoardInfos[dev->minor].ui_ScanValueArray, 0, (7 + 12) * sizeof(unsigned int)); /* 7 is the maximal number of channels */
+ /* End JK 19.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
- //BEGIN JK 02.07.04 : This while can't be do, it block the process when using severals boards
- //while(i_InterruptFlag==1)
+ /* BEGIN JK 02.07.04 : This while can't be do, it block the process when using severals boards */
+ /* while(i_InterruptFlag==1) */
while (s_BoardInfos[dev->minor].i_InterruptFlag == 1) {
#ifndef MSXBOX
udelay(1);
#else
- // In the case where the driver is compiled for the MSX-Box
- // we used a printk to have a little delay because udelay
- // seems to be broken under the MSX-Box.
- // This solution hat to be studied.
+ /* In the case where the driver is compiled for the MSX-Box */
+ /* we used a printk to have a little delay because udelay */
+ /* seems to be broken under the MSX-Box. */
+ /* This solution hat to be studied. */
printk("");
#endif
}
- //END JK 02.07.04 : This while can't be do, it block the process when using severals boards
+ /* END JK 02.07.04 : This while can't be do, it block the process when using severals boards */
- ui_ChannelNo = CR_CHAN(insn->chanspec); // get the channel
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_ChannelNo=ui_ChannelNo;
- //ui_Channel_num =ui_ChannelNo;
+ ui_ChannelNo = CR_CHAN(insn->chanspec); /* get the channel */
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_ChannelNo=ui_ChannelNo; */
+ /* ui_Channel_num =ui_ChannelNo; */
s_BoardInfos[dev->minor].i_ChannelNo = ui_ChannelNo;
s_BoardInfos[dev->minor].ui_Channel_num = ui_ChannelNo;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
if (data[5] == 0) {
if (ui_ChannelNo < 0 || ui_ChannelNo > 15) {
printk("\nThe Selection of the channel is in error\n");
i_err++;
- } // if(ui_ChannelNo<0 || ui_ChannelNo>15)
- } //if(data[5]==0)
+ } /* if(ui_ChannelNo<0 || ui_ChannelNo>15) */
+ } /* if(data[5]==0) */
else {
if (data[14] == 2) {
if (ui_ChannelNo < 0 || ui_ChannelNo > 3) {
printk("\nThe Selection of the channel is in error\n");
i_err++;
- } // if(ui_ChannelNo<0 || ui_ChannelNo>3)
- } //if(data[14]==2)
+ } /* if(ui_ChannelNo<0 || ui_ChannelNo>3) */
+ } /* if(data[14]==2) */
else {
if (ui_ChannelNo < 0 || ui_ChannelNo > 7) {
printk("\nThe Selection of the channel is in error\n");
i_err++;
- } // if(ui_ChannelNo<0 || ui_ChannelNo>7)
- } //elseif(data[14]==2)
- } //elseif(data[5]==0)
+ } /* if(ui_ChannelNo<0 || ui_ChannelNo>7) */
+ } /* elseif(data[14]==2) */
+ } /* elseif(data[5]==0) */
if (data[12] == 0 || data[12] == 1) {
switch (data[5]) {
case 0:
if (ui_ChannelNo >= 0 && ui_ChannelNo <= 3) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=0;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=0; */
s_BoardInfos[dev->minor].i_Offset = 0;
- //END JK 06.07.04: Management of sevrals boards
- } //if(ui_ChannelNo >=0 && ui_ChannelNo <=3)
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if(ui_ChannelNo >=0 && ui_ChannelNo <=3) */
if (ui_ChannelNo >= 4 && ui_ChannelNo <= 7) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=64;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=64; */
s_BoardInfos[dev->minor].i_Offset = 64;
- //END JK 06.07.04: Management of sevrals boards
- } //if(ui_ChannelNo >=4 && ui_ChannelNo <=7)
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if(ui_ChannelNo >=4 && ui_ChannelNo <=7) */
if (ui_ChannelNo >= 8 && ui_ChannelNo <= 11) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=128;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=128; */
s_BoardInfos[dev->minor].i_Offset = 128;
- //END JK 06.07.04: Management of sevrals boards
- } //if(ui_ChannelNo >=8 && ui_ChannelNo <=11)
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if(ui_ChannelNo >=8 && ui_ChannelNo <=11) */
if (ui_ChannelNo >= 12 && ui_ChannelNo <= 15) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=192;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=192; */
s_BoardInfos[dev->minor].i_Offset = 192;
- //END JK 06.07.04: Management of sevrals boards
- } //if(ui_ChannelNo >=12 && ui_ChannelNo <=15)
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if(ui_ChannelNo >=12 && ui_ChannelNo <=15) */
break;
case 1:
if (data[14] == 2) {
if (ui_ChannelNo == 0) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=0;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=0; */
s_BoardInfos[dev->minor].i_Offset = 0;
- //END JK 06.07.04: Management of sevrals boards
- } //if(ui_ChannelNo ==0 )
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if(ui_ChannelNo ==0 ) */
if (ui_ChannelNo == 1) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=0;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=0; */
s_BoardInfos[dev->minor].i_Offset = 64;
- //END JK 06.07.04: Management of sevrals boards
- } // if(ui_ChannelNo ==1)
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if(ui_ChannelNo ==1) */
if (ui_ChannelNo == 2) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=128;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=128; */
s_BoardInfos[dev->minor].i_Offset = 128;
- //END JK 06.07.04: Management of sevrals boards
- } //if(ui_ChannelNo ==2 )
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if(ui_ChannelNo ==2 ) */
if (ui_ChannelNo == 3) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=192;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=192; */
s_BoardInfos[dev->minor].i_Offset = 192;
- //END JK 06.07.04: Management of sevrals boards
- } //if(ui_ChannelNo ==3)
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if(ui_ChannelNo ==3) */
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_ChannelNo=0;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_ChannelNo=0; */
s_BoardInfos[dev->minor].i_ChannelNo = 0;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
ui_ChannelNo = 0;
break;
- } //if(data[14]==2)
+ } /* if(data[14]==2) */
if (ui_ChannelNo >= 0 && ui_ChannelNo <= 1) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=0;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=0; */
s_BoardInfos[dev->minor].i_Offset = 0;
- //END JK 06.07.04: Management of sevrals boards
- } //if(ui_ChannelNo >=0 && ui_ChannelNo <=1)
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if(ui_ChannelNo >=0 && ui_ChannelNo <=1) */
if (ui_ChannelNo >= 2 && ui_ChannelNo <= 3) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_ChannelNo=i_ChannelNo-2;
- //i_Offset=64;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_ChannelNo=i_ChannelNo-2; */
+ /* i_Offset=64; */
s_BoardInfos[dev->minor].i_ChannelNo =
s_BoardInfos[dev->minor].i_ChannelNo -
2;
s_BoardInfos[dev->minor].i_Offset = 64;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
ui_ChannelNo = ui_ChannelNo - 2;
- } //if(ui_ChannelNo >=2 && ui_ChannelNo <=3)
+ } /* if(ui_ChannelNo >=2 && ui_ChannelNo <=3) */
if (ui_ChannelNo >= 4 && ui_ChannelNo <= 5) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_ChannelNo=i_ChannelNo-4;
- //i_Offset=128;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_ChannelNo=i_ChannelNo-4; */
+ /* i_Offset=128; */
s_BoardInfos[dev->minor].i_ChannelNo =
s_BoardInfos[dev->minor].i_ChannelNo -
4;
s_BoardInfos[dev->minor].i_Offset = 128;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
ui_ChannelNo = ui_ChannelNo - 4;
- } //if(ui_ChannelNo >=4 && ui_ChannelNo <=5)
+ } /* if(ui_ChannelNo >=4 && ui_ChannelNo <=5) */
if (ui_ChannelNo >= 6 && ui_ChannelNo <= 7) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_ChannelNo=i_ChannelNo-6;
- //i_Offset=192;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_ChannelNo=i_ChannelNo-6; */
+ /* i_Offset=192; */
s_BoardInfos[dev->minor].i_ChannelNo =
s_BoardInfos[dev->minor].i_ChannelNo -
6;
s_BoardInfos[dev->minor].i_Offset = 192;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
ui_ChannelNo = ui_ChannelNo - 6;
- } //if(ui_ChannelNo >=6 && ui_ChannelNo <=7)
+ } /* if(ui_ChannelNo >=6 && ui_ChannelNo <=7) */
break;
default:
printk("\n This selection of polarity does not exist\n");
i_err++;
- } //switch(data[2])
- } //if(data[12]==0 || data[12]==1)
+ } /* switch(data[2]) */
+ } /* if(data[12]==0 || data[12]==1) */
else {
switch (data[11]) {
case 1:
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=0;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=0; */
s_BoardInfos[dev->minor].i_Offset = 0;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
break;
case 2:
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=64;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=64; */
s_BoardInfos[dev->minor].i_Offset = 64;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
break;
case 3:
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=128;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=128; */
s_BoardInfos[dev->minor].i_Offset = 128;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
break;
case 4:
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Offset=192;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Offset=192; */
s_BoardInfos[dev->minor].i_Offset = 192;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
break;
default:
printk("\nError in module selection\n");
i_err++;
- } // switch(data[11])
- } // elseif(data[12]==0 || data[12]==1)
+ } /* switch(data[11]) */
+ } /* elseif(data[12]==0 || data[12]==1) */
if (i_err) {
i_APCI3200_Reset(dev);
return -EINVAL;
}
- //if(i_ScanType!=1)
+ /* if(i_ScanType!=1) */
if (s_BoardInfos[dev->minor].i_ScanType != 1) {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Count=0;
- //i_Sum=0;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Count=0; */
+ /* i_Sum=0; */
s_BoardInfos[dev->minor].i_Count = 0;
s_BoardInfos[dev->minor].i_Sum = 0;
- //END JK 06.07.04: Management of sevrals boards
- } //if(i_ScanType!=1)
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if(i_ScanType!=1) */
ul_Config =
data[1] | (data[2] << 6) | (data[5] << 7) | (data[3] << 8) |
(data[4] << 9);
- //BEGIN JK 06.07.04: Management of sevrals boards
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
/*********************************/
/* Write the channel to configure */
/*********************************/
- //BEGIN JK 06.07.04: Management of sevrals boards
- //outl(0 | ui_ChannelNo , devpriv->iobase+i_Offset + 0x4);
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* outl(0 | ui_ChannelNo , devpriv->iobase+i_Offset + 0x4); */
outl(0 | ui_ChannelNo,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 0x4);
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
- //BEGIN JK 06.07.04: Management of sevrals boards
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
/**************************/
/* Reset the configuration */
/**************************/
- //BEGIN JK 06.07.04: Management of sevrals boards
- //outl(0 , devpriv->iobase+i_Offset + 0x0);
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* outl(0 , devpriv->iobase+i_Offset + 0x0); */
outl(0, devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 0x0);
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
- //BEGIN JK 06.07.04: Management of sevrals boards
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
/***************************/
/* Write the configuration */
/***************************/
- //BEGIN JK 06.07.04: Management of sevrals boards
- //outl(ul_Config , devpriv->iobase+i_Offset + 0x0);
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* outl(ul_Config , devpriv->iobase+i_Offset + 0x0); */
outl(ul_Config,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 0x0);
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
/***************************/
/*Reset the calibration bit */
/***************************/
- //BEGIN JK 06.07.04: Management of sevrals boards
- //ul_Temp = inl(devpriv->iobase+i_Offset + 12);
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* ul_Temp = inl(devpriv->iobase+i_Offset + 12); */
ul_Temp = inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
- //BEGIN JK 06.07.04: Management of sevrals boards
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
- //BEGIN JK 06.07.04: Management of sevrals boards
- //outl((ul_Temp & 0xFFF9FFFF) , devpriv->iobase+.i_Offset + 12);
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* outl((ul_Temp & 0xFFF9FFFF) , devpriv->iobase+.i_Offset + 12); */
outl((ul_Temp & 0xFFF9FFFF),
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
if (data[9] == 1) {
devpriv->tsk_Current = current;
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_InterruptFlag=1;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_InterruptFlag=1; */
s_BoardInfos[dev->minor].i_InterruptFlag = 1;
- //END JK 06.07.04: Management of sevrals boards
- } // if(data[9]==1)
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if(data[9]==1) */
else {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_InterruptFlag=0;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_InterruptFlag=0; */
s_BoardInfos[dev->minor].i_InterruptFlag = 0;
- //END JK 06.07.04: Management of sevrals boards
- } //else if(data[9]==1)
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* else if(data[9]==1) */
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Initialised=1;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Initialised=1; */
s_BoardInfos[dev->minor].i_Initialised = 1;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
- //BEGIN JK 06.07.04: Management of sevrals boards
- //if(i_ScanType==1)
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* if(i_ScanType==1) */
if (s_BoardInfos[dev->minor].i_ScanType == 1)
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
{
- //BEGIN JK 06.07.04: Management of sevrals boards
- //i_Sum=i_Sum+1;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* i_Sum=i_Sum+1; */
s_BoardInfos[dev->minor].i_Sum =
s_BoardInfos[dev->minor].i_Sum + 1;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
insn->unused[0] = 0;
i_APCI3200_ReadAnalogInput(dev, s, insn, &ui_Dummy);
@@ -1368,14 +1368,14 @@ int i_APCI3200_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevi
int i_ConvertCJCCalibration;
int i = 0;
- //BEGIN JK 06.07.04: Management of sevrals boards
- //if(i_Initialised==0)
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* if(i_Initialised==0) */
if (s_BoardInfos[dev->minor].i_Initialised == 0)
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
{
i_APCI3200_Reset(dev);
return -EINVAL;
- } //if(i_Initialised==0);
+ } /* if(i_Initialised==0); */
#ifdef PRINT_INFO
printk("\n insn->unused[0] = %i", insn->unused[0]);
@@ -1386,14 +1386,14 @@ int i_APCI3200_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevi
i_APCI3200_Read1AnalogInputChannel(dev, s, insn,
&ui_DummyValue);
- //BEGIN JK 06.07.04: Management of sevrals boards
- //ui_InterruptChannelValue[i_Count+0]=ui_DummyValue;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* ui_InterruptChannelValue[i_Count+0]=ui_DummyValue; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue[s_BoardInfos[dev->minor].
i_Count + 0] = ui_DummyValue;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
- //Begin JK 25.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* Begin JK 25.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
i_APCI3200_GetChannelCalibrationValue(dev,
s_BoardInfos[dev->minor].ui_Channel_num,
&s_BoardInfos[dev->minor].
@@ -1414,62 +1414,62 @@ int i_APCI3200_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevi
printk("\n s_BoardInfos [dev->minor].ui_InterruptChannelValue[s_BoardInfos [dev->minor].i_Count+8] = %lu", s_BoardInfos[dev->minor].ui_InterruptChannelValue[s_BoardInfos[dev->minor].i_Count + 8]);
#endif
- //End JK 25.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* End JK 25.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
- //BEGIN JK 06.07.04: Management of sevrals boards
- //if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE) && (i_CJCAvailable==1))
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE) && (i_CJCAvailable==1)) */
if ((s_BoardInfos[dev->minor].i_ADDIDATAType == 2)
&& (s_BoardInfos[dev->minor].i_InterruptFlag == FALSE)
&& (s_BoardInfos[dev->minor].i_CJCAvailable == 1))
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
{
i_APCI3200_ReadCJCValue(dev, &ui_DummyValue);
- //BEGIN JK 06.07.04: Management of sevrals boards
- //ui_InterruptChannelValue[i_Count + 3]=ui_DummyValue;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* ui_InterruptChannelValue[i_Count + 3]=ui_DummyValue; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue[s_BoardInfos[dev->
minor].i_Count + 3] = ui_DummyValue;
- //END JK 06.07.04: Management of sevrals boards
- } //if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE))
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE)) */
else {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //ui_InterruptChannelValue[i_Count + 3]=0;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* ui_InterruptChannelValue[i_Count + 3]=0; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue[s_BoardInfos[dev->
minor].i_Count + 3] = 0;
- //END JK 06.07.04: Management of sevrals boards
- } //elseif((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE) && (i_CJCAvailable==1))
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* elseif((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE) && (i_CJCAvailable==1)) */
- //BEGIN JK 06.07.04: Management of sevrals boards
- //if (( i_AutoCalibration == FALSE) && (i_InterruptFlag == FALSE))
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* if (( i_AutoCalibration == FALSE) && (i_InterruptFlag == FALSE)) */
if ((s_BoardInfos[dev->minor].i_AutoCalibration == FALSE)
&& (s_BoardInfos[dev->minor].i_InterruptFlag == FALSE))
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
{
i_APCI3200_ReadCalibrationOffsetValue(dev,
&ui_DummyValue);
- //BEGIN JK 06.07.04: Management of sevrals boards
- //ui_InterruptChannelValue[i_Count + 1]=ui_DummyValue;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* ui_InterruptChannelValue[i_Count + 1]=ui_DummyValue; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue[s_BoardInfos[dev->
minor].i_Count + 1] = ui_DummyValue;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
i_APCI3200_ReadCalibrationGainValue(dev,
&ui_DummyValue);
- //BEGIN JK 06.07.04: Management of sevrals boards
- //ui_InterruptChannelValue[i_Count + 2]=ui_DummyValue;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* ui_InterruptChannelValue[i_Count + 2]=ui_DummyValue; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue[s_BoardInfos[dev->
minor].i_Count + 2] = ui_DummyValue;
- //END JK 06.07.04: Management of sevrals boards
- } //if (( i_AutoCalibration == FALSE) && (i_InterruptFlag == FALSE))
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if (( i_AutoCalibration == FALSE) && (i_InterruptFlag == FALSE)) */
- //BEGIN JK 06.07.04: Management of sevrals boards
- //if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE)&& (i_CJCAvailable==1))
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE)&& (i_CJCAvailable==1)) */
if ((s_BoardInfos[dev->minor].i_ADDIDATAType == 2)
&& (s_BoardInfos[dev->minor].i_InterruptFlag == FALSE)
&& (s_BoardInfos[dev->minor].i_CJCAvailable == 1))
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
{
/**********************************************************/
/*Test if the Calibration channel must be read for the CJC */
@@ -1477,52 +1477,52 @@ int i_APCI3200_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevi
/**********************************/
/*Test if the polarity is the same */
/**********************************/
- //BEGIN JK 06.07.04: Management of sevrals boards
- //if(i_CJCPolarity!=i_ADDIDATAPolarity)
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* if(i_CJCPolarity!=i_ADDIDATAPolarity) */
if (s_BoardInfos[dev->minor].i_CJCPolarity !=
s_BoardInfos[dev->minor].i_ADDIDATAPolarity)
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
{
i_ConvertCJCCalibration = 1;
- } //if(i_CJCPolarity!=i_ADDIDATAPolarity)
+ } /* if(i_CJCPolarity!=i_ADDIDATAPolarity) */
else {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //if(i_CJCGain==i_ADDIDATAGain)
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* if(i_CJCGain==i_ADDIDATAGain) */
if (s_BoardInfos[dev->minor].i_CJCGain ==
s_BoardInfos[dev->minor].i_ADDIDATAGain)
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
{
i_ConvertCJCCalibration = 0;
- } //if(i_CJCGain==i_ADDIDATAGain)
+ } /* if(i_CJCGain==i_ADDIDATAGain) */
else {
i_ConvertCJCCalibration = 1;
- } //elseif(i_CJCGain==i_ADDIDATAGain)
- } //elseif(i_CJCPolarity!=i_ADDIDATAPolarity)
+ } /* elseif(i_CJCGain==i_ADDIDATAGain) */
+ } /* elseif(i_CJCPolarity!=i_ADDIDATAPolarity) */
if (i_ConvertCJCCalibration == 1) {
i_APCI3200_ReadCJCCalOffset(dev,
&ui_DummyValue);
- //BEGIN JK 06.07.04: Management of sevrals boards
- //ui_InterruptChannelValue[i_Count+4]=ui_DummyValue;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* ui_InterruptChannelValue[i_Count+4]=ui_DummyValue; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue[s_BoardInfos
[dev->minor].i_Count + 4] =
ui_DummyValue;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
i_APCI3200_ReadCJCCalGain(dev, &ui_DummyValue);
- //BEGIN JK 06.07.04: Management of sevrals boards
- //ui_InterruptChannelValue[i_Count+5]=ui_DummyValue;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* ui_InterruptChannelValue[i_Count+5]=ui_DummyValue; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue[s_BoardInfos
[dev->minor].i_Count + 5] =
ui_DummyValue;
- //END JK 06.07.04: Management of sevrals boards
- } //if(i_ConvertCJCCalibration==1)
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* if(i_ConvertCJCCalibration==1) */
else {
- //BEGIN JK 06.07.04: Management of sevrals boards
- //ui_InterruptChannelValue[i_Count+4]=0;
- //ui_InterruptChannelValue[i_Count+5]=0;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* ui_InterruptChannelValue[i_Count+4]=0; */
+ /* ui_InterruptChannelValue[i_Count+5]=0; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue[s_BoardInfos
@@ -1530,36 +1530,36 @@ int i_APCI3200_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevi
s_BoardInfos[dev->minor].
ui_InterruptChannelValue[s_BoardInfos
[dev->minor].i_Count + 5] = 0;
- //END JK 06.07.04: Management of sevrals boards
- } //elseif(i_ConvertCJCCalibration==1)
- } //if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE))
+ /* END JK 06.07.04: Management of sevrals boards */
+ } /* elseif(i_ConvertCJCCalibration==1) */
+ } /* if((i_ADDIDATAType==2) && (i_InterruptFlag == FALSE)) */
- //BEGIN JK 06.07.04: Management of sevrals boards
- //if(i_ScanType!=1)
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* if(i_ScanType!=1) */
if (s_BoardInfos[dev->minor].i_ScanType != 1) {
- //i_Count=0;
+ /* i_Count=0; */
s_BoardInfos[dev->minor].i_Count = 0;
- } //if(i_ScanType!=1)
+ } /* if(i_ScanType!=1) */
else {
- //i_Count=i_Count +6;
- //Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
- //s_BoardInfos [dev->minor].i_Count=s_BoardInfos [dev->minor].i_Count +6;
+ /* i_Count=i_Count +6; */
+ /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+ /* s_BoardInfos [dev->minor].i_Count=s_BoardInfos [dev->minor].i_Count +6; */
s_BoardInfos[dev->minor].i_Count =
s_BoardInfos[dev->minor].i_Count + 9;
- //End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
- } //else if(i_ScanType!=1)
+ /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+ } /* else if(i_ScanType!=1) */
- //if((i_ScanType==1) &&(i_InterruptFlag==1))
+ /* if((i_ScanType==1) &&(i_InterruptFlag==1)) */
if ((s_BoardInfos[dev->minor].i_ScanType == 1)
&& (s_BoardInfos[dev->minor].i_InterruptFlag == 1)) {
- //i_Count=i_Count-6;
- //Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
- //s_BoardInfos [dev->minor].i_Count=s_BoardInfos [dev->minor].i_Count-6;
+ /* i_Count=i_Count-6; */
+ /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+ /* s_BoardInfos [dev->minor].i_Count=s_BoardInfos [dev->minor].i_Count-6; */
s_BoardInfos[dev->minor].i_Count =
s_BoardInfos[dev->minor].i_Count - 9;
- //End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
}
- //if(i_ScanType==0)
+ /* if(i_ScanType==0) */
if (s_BoardInfos[dev->minor].i_ScanType == 0) {
/*
data[0]= ui_InterruptChannelValue[0];
@@ -1591,41 +1591,41 @@ int i_APCI3200_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevi
s_BoardInfos[dev->minor].
ui_InterruptChannelValue[5];
- //Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
- //printk("\n 0 - i_APCI3200_GetChannelCalibrationValue data [6] = %lu, data [7] = %lu, data [8] = %lu", data [6], data [7], data [8]);
+ /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+ /* printk("\n 0 - i_APCI3200_GetChannelCalibrationValue data [6] = %lu, data [7] = %lu, data [8] = %lu", data [6], data [7], data [8]); */
i_APCI3200_GetChannelCalibrationValue(dev,
s_BoardInfos[dev->minor].ui_Channel_num,
&data[6], &data[7], &data[8]);
- //End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
}
break;
case 1:
for (i = 0; i < insn->n; i++) {
- //data[i]=ui_InterruptChannelValue[i];
+ /* data[i]=ui_InterruptChannelValue[i]; */
data[i] =
s_BoardInfos[dev->minor].
ui_InterruptChannelValue[i];
}
- //i_Count=0;
- //i_Sum=0;
- //if(i_ScanType==1)
+ /* i_Count=0; */
+ /* i_Sum=0; */
+ /* if(i_ScanType==1) */
s_BoardInfos[dev->minor].i_Count = 0;
s_BoardInfos[dev->minor].i_Sum = 0;
if (s_BoardInfos[dev->minor].i_ScanType == 1) {
- //i_Initialised=0;
- //i_InterruptFlag=0;
+ /* i_Initialised=0; */
+ /* i_InterruptFlag=0; */
s_BoardInfos[dev->minor].i_Initialised = 0;
s_BoardInfos[dev->minor].i_InterruptFlag = 0;
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
}
break;
default:
printk("\nThe parameters passed are in error\n");
i_APCI3200_Reset(dev);
return -EINVAL;
- } //switch(insn->unused[0])
+ } /* switch(insn->unused[0]) */
return insn->n;
}
@@ -1658,42 +1658,42 @@ int i_APCI3200_Read1AnalogInputChannel(struct comedi_device * dev,
unsigned int ui_ChannelNo = 0;
unsigned int ui_CommandRegister = 0;
- //BEGIN JK 06.07.04: Management of sevrals boards
- //ui_ChannelNo=i_ChannelNo;
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* ui_ChannelNo=i_ChannelNo; */
ui_ChannelNo = s_BoardInfos[dev->minor].i_ChannelNo;
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
/*********************************/
/* Write the channel to configure */
/*********************************/
- //Begin JK 20.10.2004: Bad channel value is used when using differential mode
- //outl(0 | ui_Channel_num , devpriv->iobase+i_Offset + 0x4);
- //outl(0 | s_BoardInfos [dev->minor].ui_Channel_num , devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 0x4);
+ /* Begin JK 20.10.2004: Bad channel value is used when using differential mode */
+ /* outl(0 | ui_Channel_num , devpriv->iobase+i_Offset + 0x4); */
+ /* outl(0 | s_BoardInfos [dev->minor].ui_Channel_num , devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 0x4); */
outl(0 | s_BoardInfos[dev->minor].i_ChannelNo,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 0x4);
- //End JK 20.10.2004: Bad channel value is used when using differential mode
+ /* End JK 20.10.2004: Bad channel value is used when using differential mode */
/*******************************/
/* Set the convert timing unit */
/*******************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(i_ADDIDATAConversionTimeUnit , devpriv->iobase+i_Offset + 36);
+ /* outl(i_ADDIDATAConversionTimeUnit , devpriv->iobase+i_Offset + 36); */
outl(s_BoardInfos[dev->minor].i_ADDIDATAConversionTimeUnit,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 36);
/**************************/
/* Set the convert timing */
/**************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(i_ADDIDATAConversionTime , devpriv->iobase+i_Offset + 32);
+ /* outl(i_ADDIDATAConversionTime , devpriv->iobase+i_Offset + 32); */
outl(s_BoardInfos[dev->minor].i_ADDIDATAConversionTime,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 32);
@@ -1707,36 +1707,36 @@ int i_APCI3200_Read1AnalogInputChannel(struct comedi_device * dev,
/*Test if the interrupt is enable */
/*********************************/
- //if (i_InterruptFlag == ADDIDATA_ENABLE)
+ /* if (i_InterruptFlag == ADDIDATA_ENABLE) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == ADDIDATA_ENABLE) {
/************************/
/* Enable the interrupt */
/************************/
ui_CommandRegister = ui_CommandRegister | 0x00100000;
- } //if (i_InterruptFlag == ADDIDATA_ENABLE)
+ } /* if (i_InterruptFlag == ADDIDATA_ENABLE) */
/******************************/
/* Write the command register */
/******************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(ui_CommandRegister, devpriv->iobase+i_Offset + 8);
+ /* outl(ui_CommandRegister, devpriv->iobase+i_Offset + 8); */
outl(ui_CommandRegister,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 8);
/*****************************/
/*Test if interrupt is enable */
/*****************************/
- //if (i_InterruptFlag == ADDIDATA_DISABLE)
+ /* if (i_InterruptFlag == ADDIDATA_DISABLE) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == ADDIDATA_DISABLE) {
do {
/*************************/
/*Read the EOC Status bit */
/*************************/
- //ui_EOC = inl(devpriv->iobase+i_Offset + 20) & 1;
+ /* ui_EOC = inl(devpriv->iobase+i_Offset + 20) & 1; */
ui_EOC = inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 20) & 1;
@@ -1746,13 +1746,13 @@ int i_APCI3200_Read1AnalogInputChannel(struct comedi_device * dev,
/* Read the digital value of the input */
/***************************************/
- //data[0] = inl (devpriv->iobase+i_Offset + 28);
+ /* data[0] = inl (devpriv->iobase+i_Offset + 28); */
data[0] =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 28);
- //END JK 06.07.04: Management of sevrals boards
+ /* END JK 06.07.04: Management of sevrals boards */
- } // if (i_InterruptFlag == ADDIDATA_DISABLE)
+ } /* if (i_InterruptFlag == ADDIDATA_DISABLE) */
return 0;
}
@@ -1781,49 +1781,49 @@ int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device * dev, unsigned i
unsigned int ui_Temp = 0, ui_EOC = 0;
unsigned int ui_CommandRegister = 0;
- //BEGIN JK 06.07.04: Management of sevrals boards
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* BEGIN JK 06.07.04: Management of sevrals boards */
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
/*********************************/
/* Write the channel to configure */
/*********************************/
- //Begin JK 20.10.2004: This seems not necessary !
- //outl(0 | ui_Channel_num , devpriv->iobase+i_Offset + 0x4);
- //outl(0 | s_BoardInfos [dev->minor].ui_Channel_num , devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 0x4);
- //End JK 20.10.2004: This seems not necessary !
+ /* Begin JK 20.10.2004: This seems not necessary ! */
+ /* outl(0 | ui_Channel_num , devpriv->iobase+i_Offset + 0x4); */
+ /* outl(0 | s_BoardInfos [dev->minor].ui_Channel_num , devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 0x4); */
+ /* End JK 20.10.2004: This seems not necessary ! */
/*******************************/
/* Set the convert timing unit */
/*******************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(i_ADDIDATAConversionTimeUnit , devpriv->iobase+i_Offset + 36);
+ /* outl(i_ADDIDATAConversionTimeUnit , devpriv->iobase+i_Offset + 36); */
outl(s_BoardInfos[dev->minor].i_ADDIDATAConversionTimeUnit,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 36);
/**************************/
/* Set the convert timing */
/**************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(i_ADDIDATAConversionTime , devpriv->iobase+i_Offset + 32);
+ /* outl(i_ADDIDATAConversionTime , devpriv->iobase+i_Offset + 32); */
outl(s_BoardInfos[dev->minor].i_ADDIDATAConversionTime,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 32);
/*****************************/
/*Read the calibration offset */
/*****************************/
- //ui_Temp = inl(devpriv->iobase+i_Offset + 12);
+ /* ui_Temp = inl(devpriv->iobase+i_Offset + 12); */
ui_Temp = inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
/*********************************/
/*Configure the Offset Conversion */
/*********************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl((ui_Temp | 0x00020000), devpriv->iobase+i_Offset + 12);
+ /* outl((ui_Temp | 0x00020000), devpriv->iobase+i_Offset + 12); */
outl((ui_Temp | 0x00020000),
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
/*******************************/
@@ -1836,7 +1836,7 @@ int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device * dev, unsigned i
/*Test if the interrupt is enable */
/*********************************/
- //if (i_InterruptFlag == ADDIDATA_ENABLE)
+ /* if (i_InterruptFlag == ADDIDATA_ENABLE) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == ADDIDATA_ENABLE) {
/**********************/
@@ -1845,7 +1845,7 @@ int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device * dev, unsigned i
ui_CommandRegister = ui_CommandRegister | 0x00100000;
- } //if (i_InterruptFlag == ADDIDATA_ENABLE)
+ } /* if (i_InterruptFlag == ADDIDATA_ENABLE) */
/**********************/
/*Start the conversion */
@@ -1855,10 +1855,10 @@ int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device * dev, unsigned i
/***************************/
/*Write the command regiter */
/***************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(ui_CommandRegister, devpriv->iobase+i_Offset + 8);
+ /* outl(ui_CommandRegister, devpriv->iobase+i_Offset + 8); */
outl(ui_CommandRegister,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 8);
@@ -1866,7 +1866,7 @@ int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device * dev, unsigned i
/*Test if interrupt is enable */
/*****************************/
- //if (i_InterruptFlag == ADDIDATA_DISABLE)
+ /* if (i_InterruptFlag == ADDIDATA_DISABLE) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == ADDIDATA_DISABLE) {
do {
@@ -1874,7 +1874,7 @@ int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device * dev, unsigned i
/*Read the EOC flag */
/*******************/
- //ui_EOC = inl (devpriv->iobase+i_Offset + 20) & 1;
+ /* ui_EOC = inl (devpriv->iobase+i_Offset + 20) & 1; */
ui_EOC = inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 20) & 1;
@@ -1884,11 +1884,11 @@ int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device * dev, unsigned i
/*Read the digital value of the calibration Offset */
/**************************************************/
- //data[0] = inl(devpriv->iobase+i_Offset+ 28);
+ /* data[0] = inl(devpriv->iobase+i_Offset+ 28); */
data[0] =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 28);
- } //if (i_InterruptFlag == ADDIDATA_DISABLE)
+ } /* if (i_InterruptFlag == ADDIDATA_DISABLE) */
return 0;
}
@@ -1917,16 +1917,16 @@ int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, unsigned int
unsigned int ui_EOC = 0;
int ui_CommandRegister = 0;
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
/*********************************/
/* Write the channel to configure */
/*********************************/
- //Begin JK 20.10.2004: This seems not necessary !
- //outl(0 | ui_Channel_num , devpriv->iobase+i_Offset + 0x4);
- //outl(0 | s_BoardInfos [dev->minor].ui_Channel_num , devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 0x4);
- //End JK 20.10.2004: This seems not necessary !
+ /* Begin JK 20.10.2004: This seems not necessary ! */
+ /* outl(0 | ui_Channel_num , devpriv->iobase+i_Offset + 0x4); */
+ /* outl(0 | s_BoardInfos [dev->minor].ui_Channel_num , devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 0x4); */
+ /* End JK 20.10.2004: This seems not necessary ! */
/***************************/
/*Read the calibration gain */
@@ -1934,28 +1934,28 @@ int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, unsigned int
/*******************************/
/* Set the convert timing unit */
/*******************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(i_ADDIDATAConversionTimeUnit , devpriv->iobase+i_Offset + 36);
+ /* outl(i_ADDIDATAConversionTimeUnit , devpriv->iobase+i_Offset + 36); */
outl(s_BoardInfos[dev->minor].i_ADDIDATAConversionTimeUnit,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 36);
/**************************/
/* Set the convert timing */
/**************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(i_ADDIDATAConversionTime , devpriv->iobase+i_Offset + 32);
+ /* outl(i_ADDIDATAConversionTime , devpriv->iobase+i_Offset + 32); */
outl(s_BoardInfos[dev->minor].i_ADDIDATAConversionTime,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 32);
/*******************************/
/*Configure the Gain Conversion */
/*******************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(0x00040000 , devpriv->iobase+i_Offset + 12);
+ /* outl(0x00040000 , devpriv->iobase+i_Offset + 12); */
outl(0x00040000,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
@@ -1969,7 +1969,7 @@ int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, unsigned int
/*Test if the interrupt is enable */
/*********************************/
- //if (i_InterruptFlag == ADDIDATA_ENABLE)
+ /* if (i_InterruptFlag == ADDIDATA_ENABLE) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == ADDIDATA_ENABLE) {
/**********************/
@@ -1978,7 +1978,7 @@ int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, unsigned int
ui_CommandRegister = ui_CommandRegister | 0x00100000;
- } //if (i_InterruptFlag == ADDIDATA_ENABLE)
+ } /* if (i_InterruptFlag == ADDIDATA_ENABLE) */
/**********************/
/*Start the conversion */
@@ -1988,10 +1988,10 @@ int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, unsigned int
/***************************/
/*Write the command regiter */
/***************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(ui_CommandRegister , devpriv->iobase+i_Offset + 8);
+ /* outl(ui_CommandRegister , devpriv->iobase+i_Offset + 8); */
outl(ui_CommandRegister,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 8);
@@ -1999,7 +1999,7 @@ int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, unsigned int
/*Test if interrupt is enable */
/*****************************/
- //if (i_InterruptFlag == ADDIDATA_DISABLE)
+ /* if (i_InterruptFlag == ADDIDATA_DISABLE) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == ADDIDATA_DISABLE) {
do {
@@ -2008,7 +2008,7 @@ int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, unsigned int
/*Read the EOC flag */
/*******************/
- //ui_EOC = inl(devpriv->iobase+i_Offset + 20) & 1;
+ /* ui_EOC = inl(devpriv->iobase+i_Offset + 20) & 1; */
ui_EOC = inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 20) & 1;
@@ -2018,12 +2018,12 @@ int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, unsigned int
/*Read the digital value of the calibration Gain */
/************************************************/
- //data[0] = inl(devpriv->iobase+i_Offset + 28);
+ /* data[0] = inl(devpriv->iobase+i_Offset + 28); */
data[0] =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 28);
- } //if (i_InterruptFlag == ADDIDATA_DISABLE)
+ } /* if (i_InterruptFlag == ADDIDATA_DISABLE) */
return 0;
}
@@ -2057,32 +2057,32 @@ int i_APCI3200_ReadCJCValue(struct comedi_device * dev, unsigned int * data)
/*Set the converting time unit */
/******************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(i_ADDIDATAConversionTimeUnit , devpriv->iobase+i_Offset + 36);
+ /* outl(i_ADDIDATAConversionTimeUnit , devpriv->iobase+i_Offset + 36); */
outl(s_BoardInfos[dev->minor].i_ADDIDATAConversionTimeUnit,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 36);
/**************************/
/* Set the convert timing */
/**************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(i_ADDIDATAConversionTime , devpriv->iobase+i_Offset + 32);
+ /* outl(i_ADDIDATAConversionTime , devpriv->iobase+i_Offset + 32); */
outl(s_BoardInfos[dev->minor].i_ADDIDATAConversionTime,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 32);
/******************************/
/*Configure the CJC Conversion */
/******************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl( 0x00000400 , devpriv->iobase+i_Offset + 4);
+ /* outl( 0x00000400 , devpriv->iobase+i_Offset + 4); */
outl(0x00000400,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 4);
/*******************************/
@@ -2092,7 +2092,7 @@ int i_APCI3200_ReadCJCValue(struct comedi_device * dev, unsigned int * data)
/*********************************/
/*Test if the interrupt is enable */
/*********************************/
- //if (i_InterruptFlag == ADDIDATA_ENABLE)
+ /* if (i_InterruptFlag == ADDIDATA_ENABLE) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == ADDIDATA_ENABLE) {
/**********************/
/*Enable the interrupt */
@@ -2109,10 +2109,10 @@ int i_APCI3200_ReadCJCValue(struct comedi_device * dev, unsigned int * data)
/***************************/
/*Write the command regiter */
/***************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(ui_CommandRegister , devpriv->iobase+i_Offset + 8);
+ /* outl(ui_CommandRegister , devpriv->iobase+i_Offset + 8); */
outl(ui_CommandRegister,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 8);
@@ -2120,7 +2120,7 @@ int i_APCI3200_ReadCJCValue(struct comedi_device * dev, unsigned int * data)
/*Test if interrupt is enable */
/*****************************/
- //if (i_InterruptFlag == ADDIDATA_DISABLE)
+ /* if (i_InterruptFlag == ADDIDATA_DISABLE) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == ADDIDATA_DISABLE) {
do {
@@ -2128,7 +2128,7 @@ int i_APCI3200_ReadCJCValue(struct comedi_device * dev, unsigned int * data)
/*Read the EOC flag */
/*******************/
- //ui_EOC = inl(devpriv->iobase+i_Offset + 20) & 1;
+ /* ui_EOC = inl(devpriv->iobase+i_Offset + 20) & 1; */
ui_EOC = inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 20) & 1;
@@ -2138,12 +2138,12 @@ int i_APCI3200_ReadCJCValue(struct comedi_device * dev, unsigned int * data)
/*Read the digital value of the CJC */
/***********************************/
- //data[0] = inl(devpriv->iobase+i_Offset + 28);
+ /* data[0] = inl(devpriv->iobase+i_Offset + 28); */
data[0] =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 28);
- } //if (i_InterruptFlag == ADDIDATA_DISABLE)
+ } /* if (i_InterruptFlag == ADDIDATA_DISABLE) */
return 0;
}
@@ -2177,37 +2177,37 @@ int i_APCI3200_ReadCJCCalOffset(struct comedi_device * dev, unsigned int * data)
/*******************************/
/* Set the convert timing unit */
/*******************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(i_ADDIDATAConversionTimeUnit , devpriv->iobase+i_Offset + 36);
+ /* outl(i_ADDIDATAConversionTimeUnit , devpriv->iobase+i_Offset + 36); */
outl(s_BoardInfos[dev->minor].i_ADDIDATAConversionTimeUnit,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 36);
/**************************/
/* Set the convert timing */
/**************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(i_ADDIDATAConversionTime , devpriv->iobase+i_Offset + 32);
+ /* outl(i_ADDIDATAConversionTime , devpriv->iobase+i_Offset + 32); */
outl(s_BoardInfos[dev->minor].i_ADDIDATAConversionTime,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 32);
/******************************/
/*Configure the CJC Conversion */
/******************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(0x00000400 , devpriv->iobase+i_Offset + 4);
+ /* outl(0x00000400 , devpriv->iobase+i_Offset + 4); */
outl(0x00000400,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 4);
/*********************************/
/*Configure the Offset Conversion */
/*********************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(0x00020000, devpriv->iobase+i_Offset + 12);
+ /* outl(0x00020000, devpriv->iobase+i_Offset + 12); */
outl(0x00020000,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
/*******************************/
@@ -2218,7 +2218,7 @@ int i_APCI3200_ReadCJCCalOffset(struct comedi_device * dev, unsigned int * data)
/*Test if the interrupt is enable */
/*********************************/
- //if (i_InterruptFlag == ADDIDATA_ENABLE)
+ /* if (i_InterruptFlag == ADDIDATA_ENABLE) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == ADDIDATA_ENABLE) {
/**********************/
/*Enable the interrupt */
@@ -2234,19 +2234,19 @@ int i_APCI3200_ReadCJCCalOffset(struct comedi_device * dev, unsigned int * data)
/***************************/
/*Write the command regiter */
/***************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(ui_CommandRegister,devpriv->iobase+i_Offset + 8);
+ /* outl(ui_CommandRegister,devpriv->iobase+i_Offset + 8); */
outl(ui_CommandRegister,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 8);
- //if (i_InterruptFlag == ADDIDATA_DISABLE)
+ /* if (i_InterruptFlag == ADDIDATA_DISABLE) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == ADDIDATA_DISABLE) {
do {
/*******************/
/*Read the EOC flag */
/*******************/
- //ui_EOC = inl(devpriv->iobase+i_Offset + 20) & 1;
+ /* ui_EOC = inl(devpriv->iobase+i_Offset + 20) & 1; */
ui_EOC = inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 20) & 1;
} while (ui_EOC != 1);
@@ -2254,11 +2254,11 @@ int i_APCI3200_ReadCJCCalOffset(struct comedi_device * dev, unsigned int * data)
/**************************************************/
/*Read the digital value of the calibration Offset */
/**************************************************/
- //data[0] = inl(devpriv->iobase+i_Offset + 28);
+ /* data[0] = inl(devpriv->iobase+i_Offset + 28); */
data[0] =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 28);
- } //if (i_InterruptFlag == ADDIDATA_DISABLE)
+ } /* if (i_InterruptFlag == ADDIDATA_DISABLE) */
return 0;
}
@@ -2290,37 +2290,37 @@ int i_APCI3200_ReadCJCCalGain(struct comedi_device * dev, unsigned int * data)
/*******************************/
/* Set the convert timing unit */
/*******************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(i_ADDIDATAConversionTimeUnit , devpriv->iobase+i_Offset + 36);
+ /* outl(i_ADDIDATAConversionTimeUnit , devpriv->iobase+i_Offset + 36); */
outl(s_BoardInfos[dev->minor].i_ADDIDATAConversionTimeUnit,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 36);
/**************************/
/* Set the convert timing */
/**************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(i_ADDIDATAConversionTime , devpriv->iobase+i_Offset + 32);
+ /* outl(i_ADDIDATAConversionTime , devpriv->iobase+i_Offset + 32); */
outl(s_BoardInfos[dev->minor].i_ADDIDATAConversionTime,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 32);
/******************************/
/*Configure the CJC Conversion */
/******************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(0x00000400,devpriv->iobase+i_Offset + 4);
+ /* outl(0x00000400,devpriv->iobase+i_Offset + 4); */
outl(0x00000400,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 4);
/*******************************/
/*Configure the Gain Conversion */
/*******************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(0x00040000,devpriv->iobase+i_Offset + 12);
+ /* outl(0x00040000,devpriv->iobase+i_Offset + 12); */
outl(0x00040000,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
@@ -2331,7 +2331,7 @@ int i_APCI3200_ReadCJCCalGain(struct comedi_device * dev, unsigned int * data)
/*********************************/
/*Test if the interrupt is enable */
/*********************************/
- //if (i_InterruptFlag == ADDIDATA_ENABLE)
+ /* if (i_InterruptFlag == ADDIDATA_ENABLE) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == ADDIDATA_ENABLE) {
/**********************/
/*Enable the interrupt */
@@ -2345,30 +2345,30 @@ int i_APCI3200_ReadCJCCalGain(struct comedi_device * dev, unsigned int * data)
/***************************/
/*Write the command regiter */
/***************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(ui_CommandRegister ,devpriv->iobase+i_Offset + 8);
+ /* outl(ui_CommandRegister ,devpriv->iobase+i_Offset + 8); */
outl(ui_CommandRegister,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 8);
- //if (i_InterruptFlag == ADDIDATA_DISABLE)
+ /* if (i_InterruptFlag == ADDIDATA_DISABLE) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == ADDIDATA_DISABLE) {
do {
/*******************/
/*Read the EOC flag */
/*******************/
- //ui_EOC = inl(devpriv->iobase+i_Offset + 20) & 1;
+ /* ui_EOC = inl(devpriv->iobase+i_Offset + 20) & 1; */
ui_EOC = inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 20) & 1;
} while (ui_EOC != 1);
/************************************************/
/*Read the digital value of the calibration Gain */
/************************************************/
- //data[0] = inl (devpriv->iobase+i_Offset + 28);
+ /* data[0] = inl (devpriv->iobase+i_Offset + 28); */
data[0] =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 28);
- } //if (i_InterruptFlag == ADDIDATA_DISABLE)
+ } /* if (i_InterruptFlag == ADDIDATA_DISABLE) */
return 0;
}
@@ -2408,29 +2408,29 @@ int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device * dev,
struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)
{
unsigned int ui_Configuration = 0;
- int i_Temp; //,i_TimeUnit;
- //if(i_Initialised==0)
+ int i_Temp; /* ,i_TimeUnit; */
+ /* if(i_Initialised==0) */
if (s_BoardInfos[dev->minor].i_Initialised == 0) {
i_APCI3200_Reset(dev);
return -EINVAL;
- } //if(i_Initialised==0);
+ } /* if(i_Initialised==0); */
if (data[0] != 0 && data[0] != 1) {
printk("\nError in selection of functionality\n");
i_APCI3200_Reset(dev);
return -EINVAL;
- } //if(data[0]!=0 && data[0]!=1)
+ } /* if(data[0]!=0 && data[0]!=1) */
- if (data[0] == 1) //Perform Short Circuit TEST
+ if (data[0] == 1) /* Perform Short Circuit TEST */
{
/**************************/
/*Set the short-cicuit bit */
/**************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].
i_Offset + 12) >> 19) & 1) !=
1) ;
- //outl((0x00001000 |i_ChannelNo) , devpriv->iobase+i_Offset + 4);
+ /* outl((0x00001000 |i_ChannelNo) , devpriv->iobase+i_Offset + 4); */
outl((0x00001000 | s_BoardInfos[dev->minor].i_ChannelNo),
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
4);
@@ -2439,19 +2439,19 @@ int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device * dev,
/*************************/
/* i_TimeUnit= i_ADDIDATAConversionTimeUnit;
i_ADDIDATAConversionTimeUnit= 1; */
- //i_Temp= i_InterruptFlag ;
+ /* i_Temp= i_InterruptFlag ; */
i_Temp = s_BoardInfos[dev->minor].i_InterruptFlag;
- //i_InterruptFlag = ADDIDATA_DISABLE;
+ /* i_InterruptFlag = ADDIDATA_DISABLE; */
s_BoardInfos[dev->minor].i_InterruptFlag = ADDIDATA_DISABLE;
i_APCI3200_Read1AnalogInputChannel(dev, s, insn, data);
- //if(i_AutoCalibration == FALSE)
+ /* if(i_AutoCalibration == FALSE) */
if (s_BoardInfos[dev->minor].i_AutoCalibration == FALSE) {
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].
i_Offset +
12) >> 19) & 1) != 1) ;
- //outl((0x00001000 |i_ChannelNo) , devpriv->iobase+i_Offset + 4);
+ /* outl((0x00001000 |i_ChannelNo) , devpriv->iobase+i_Offset + 4); */
outl((0x00001000 | s_BoardInfos[dev->minor].
i_ChannelNo),
devpriv->iobase +
@@ -2462,15 +2462,15 @@ int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device * dev,
i_APCI3200_ReadCalibrationGainValue(dev, data);
}
} else {
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].
i_Offset + 12) >> 19) & 1) !=
1) ;
- //outl((0x00000800|i_ChannelNo) , devpriv->iobase+i_Offset + 4);
+ /* outl((0x00000800|i_ChannelNo) , devpriv->iobase+i_Offset + 4); */
outl((0x00000800 | s_BoardInfos[dev->minor].i_ChannelNo),
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
4);
- //ui_Configuration = inl(devpriv->iobase+i_Offset + 0);
+ /* ui_Configuration = inl(devpriv->iobase+i_Offset + 0); */
ui_Configuration =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 0);
@@ -2479,18 +2479,18 @@ int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device * dev,
/*************************/
/* i_TimeUnit= i_ADDIDATAConversionTimeUnit;
i_ADDIDATAConversionTimeUnit= 1; */
- //i_Temp= i_InterruptFlag ;
+ /* i_Temp= i_InterruptFlag ; */
i_Temp = s_BoardInfos[dev->minor].i_InterruptFlag;
- //i_InterruptFlag = ADDIDATA_DISABLE;
+ /* i_InterruptFlag = ADDIDATA_DISABLE; */
s_BoardInfos[dev->minor].i_InterruptFlag = ADDIDATA_DISABLE;
i_APCI3200_Read1AnalogInputChannel(dev, s, insn, data);
- //if(i_AutoCalibration == FALSE)
+ /* if(i_AutoCalibration == FALSE) */
if (s_BoardInfos[dev->minor].i_AutoCalibration == FALSE) {
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].
i_Offset +
12) >> 19) & 1) != 1) ;
- //outl((0x00000800|i_ChannelNo) , devpriv->iobase+i_Offset + 4);
+ /* outl((0x00000800|i_ChannelNo) , devpriv->iobase+i_Offset + 4); */
outl((0x00000800 | s_BoardInfos[dev->minor].
i_ChannelNo),
devpriv->iobase +
@@ -2501,9 +2501,9 @@ int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device * dev,
i_APCI3200_ReadCalibrationGainValue(dev, data);
}
}
- //i_InterruptFlag=i_Temp ;
+ /* i_InterruptFlag=i_Temp ; */
s_BoardInfos[dev->minor].i_InterruptFlag = i_Temp;
- //printk("\ni_InterruptFlag=%d\n",i_InterruptFlag);
+ /* printk("\ni_InterruptFlag=%d\n",i_InterruptFlag); */
return insn->n;
}
@@ -2565,7 +2565,7 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_
{
int err = 0;
- int tmp; // divisor1,divisor2;
+ int tmp; /* divisor1,divisor2; */
unsigned int ui_ConvertTime = 0;
unsigned int ui_ConvertTimeBase = 0;
unsigned int ui_DelayTime = 0;
@@ -2576,7 +2576,7 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_
int i_Cpt = 0;
double d_ConversionTimeForAllChannels = 0.0;
double d_SCANTimeNewUnit = 0.0;
- // step 1: make sure trigger sources are trivially valid
+ /* step 1: make sure trigger sources are trivially valid */
tmp = cmd->start_src;
cmd->start_src &= TRIG_NOW | TRIG_EXT;
@@ -2598,10 +2598,10 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_
cmd->stop_src &= TRIG_COUNT | TRIG_NONE;
if (!cmd->stop_src || tmp != cmd->stop_src)
err++;
- //if(i_InterruptFlag==0)
+ /* if(i_InterruptFlag==0) */
if (s_BoardInfos[dev->minor].i_InterruptFlag == 0) {
err++;
- // printk("\nThe interrupt should be enabled\n");
+ /* printk("\nThe interrupt should be enabled\n"); */
}
if (err) {
i_APCI3200_Reset(dev);
@@ -2643,9 +2643,9 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_
i_APCI3200_Reset(dev);
return 2;
}
- //i_FirstChannel=cmd->chanlist[0];
+ /* i_FirstChannel=cmd->chanlist[0]; */
s_BoardInfos[dev->minor].i_FirstChannel = cmd->chanlist[0];
- //i_LastChannel=cmd->chanlist[1];
+ /* i_LastChannel=cmd->chanlist[1]; */
s_BoardInfos[dev->minor].i_LastChannel = cmd->chanlist[1];
if (cmd->convert_src == TRIG_TIMER) {
@@ -2656,11 +2656,11 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_
{
printk("\nThe selection of conversion time reload value is in error\n");
err++;
- } // if (ui_ConvertTime!=20 && ui_ConvertTime!=40 && ui_ConvertTime!=80 && ui_ConvertTime!=160 )
+ } /* if (ui_ConvertTime!=20 && ui_ConvertTime!=40 && ui_ConvertTime!=80 && ui_ConvertTime!=160 ) */
if (ui_ConvertTimeBase != 2) {
printk("\nThe selection of conversion time unit is in error\n");
err++;
- } //if(ui_ConvertTimeBase!=2)
+ } /* if(ui_ConvertTimeBase!=2) */
} else {
ui_ConvertTime = 0;
ui_ConvertTimeBase = 0;
@@ -2668,7 +2668,7 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_
if (cmd->scan_begin_src == TRIG_FOLLOW) {
ui_DelayTime = 0;
ui_DelayTimeBase = 0;
- } //if(cmd->scan_begin_src==TRIG_FOLLOW)
+ } /* if(cmd->scan_begin_src==TRIG_FOLLOW) */
else {
ui_DelayTime = cmd->scan_begin_arg & 0xFFFF;
ui_DelayTimeBase = cmd->scan_begin_arg >> 16;
@@ -2686,7 +2686,7 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_
}
fpu_begin();
d_SCANTimeNewUnit = (double)ui_DelayTime;
- //i_NbrOfChannel= i_LastChannel-i_FirstChannel + 4;
+ /* i_NbrOfChannel= i_LastChannel-i_FirstChannel + 4; */
i_NbrOfChannel =
s_BoardInfos[dev->minor].i_LastChannel -
s_BoardInfos[dev->minor].i_FirstChannel + 4;
@@ -2736,7 +2736,7 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_
err++;
}
fpu_end();
- } //else if(cmd->scan_begin_src==TRIG_FOLLOW)
+ } /* else if(cmd->scan_begin_src==TRIG_FOLLOW) */
if (err) {
i_APCI3200_Reset(dev);
@@ -2767,10 +2767,10 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_
int i_APCI3200_StopCyclicAcquisition(struct comedi_device * dev, struct comedi_subdevice * s)
{
unsigned int ui_Configuration = 0;
- //i_InterruptFlag=0;
- //i_Initialised=0;
- //i_Count=0;
- //i_Sum=0;
+ /* i_InterruptFlag=0; */
+ /* i_Initialised=0; */
+ /* i_Count=0; */
+ /* i_Sum=0; */
s_BoardInfos[dev->minor].i_InterruptFlag = 0;
s_BoardInfos[dev->minor].i_Initialised = 0;
s_BoardInfos[dev->minor].i_Count = 0;
@@ -2779,16 +2779,16 @@ int i_APCI3200_StopCyclicAcquisition(struct comedi_device * dev, struct comedi_s
/*******************/
/*Read the register */
/*******************/
- //ui_Configuration = inl(devpriv->iobase+i_Offset + 8);
+ /* ui_Configuration = inl(devpriv->iobase+i_Offset + 8); */
ui_Configuration =
inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 8);
/*****************************/
/*Reset the START and IRQ bit */
/*****************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl((ui_Configuration & 0xFFE7FFFF),devpriv->iobase+i_Offset + 8);
+ /* outl((ui_Configuration & 0xFFE7FFFF),devpriv->iobase+i_Offset + 8); */
outl((ui_Configuration & 0xFFE7FFFF),
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 8);
return 0;
@@ -2818,7 +2818,7 @@ int i_APCI3200_CommandAnalogInput(struct comedi_device * dev, struct comedi_subd
{
struct comedi_cmd *cmd = &s->async->cmd;
unsigned int ui_Configuration = 0;
- //INT i_CurrentSource = 0;
+ /* INT i_CurrentSource = 0; */
unsigned int ui_Trigger = 0;
unsigned int ui_TriggerEdge = 0;
unsigned int ui_Triggermode = 0;
@@ -2828,38 +2828,38 @@ int i_APCI3200_CommandAnalogInput(struct comedi_device * dev, struct comedi_subd
unsigned int ui_DelayTime = 0;
unsigned int ui_DelayTimeBase = 0;
unsigned int ui_DelayMode = 0;
- //i_FirstChannel=cmd->chanlist[0];
- //i_LastChannel=cmd->chanlist[1];
+ /* i_FirstChannel=cmd->chanlist[0]; */
+ /* i_LastChannel=cmd->chanlist[1]; */
s_BoardInfos[dev->minor].i_FirstChannel = cmd->chanlist[0];
s_BoardInfos[dev->minor].i_LastChannel = cmd->chanlist[1];
if (cmd->start_src == TRIG_EXT) {
ui_Trigger = 1;
ui_TriggerEdge = cmd->start_arg & 0xFFFF;
ui_Triggermode = cmd->start_arg >> 16;
- } //if(cmd->start_src==TRIG_EXT)
+ } /* if(cmd->start_src==TRIG_EXT) */
else {
ui_Trigger = 0;
- } //elseif(cmd->start_src==TRIG_EXT)
+ } /* elseif(cmd->start_src==TRIG_EXT) */
if (cmd->stop_src == TRIG_COUNT) {
ui_ScanMode = 0;
- } // if (cmd->stop_src==TRIG_COUNT)
+ } /* if (cmd->stop_src==TRIG_COUNT) */
else {
ui_ScanMode = 2;
- } //else if (cmd->stop_src==TRIG_COUNT)
+ } /* else if (cmd->stop_src==TRIG_COUNT) */
if (cmd->scan_begin_src == TRIG_FOLLOW) {
ui_DelayTime = 0;
ui_DelayTimeBase = 0;
ui_DelayMode = 0;
- } //if(cmd->scan_begin_src==TRIG_FOLLOW)
+ } /* if(cmd->scan_begin_src==TRIG_FOLLOW) */
else {
ui_DelayTime = cmd->scan_begin_arg & 0xFFFF;
ui_DelayTimeBase = cmd->scan_begin_arg >> 16;
ui_DelayMode = 1;
- } //else if(cmd->scan_begin_src==TRIG_FOLLOW)
- // printk("\nui_DelayTime=%u\n",ui_DelayTime);
- // printk("\nui_DelayTimeBase=%u\n",ui_DelayTimeBase);
+ } /* else if(cmd->scan_begin_src==TRIG_FOLLOW) */
+ /* printk("\nui_DelayTime=%u\n",ui_DelayTime); */
+ /* printk("\nui_DelayTimeBase=%u\n",ui_DelayTimeBase); */
if (cmd->convert_src == TRIG_TIMER) {
ui_ConvertTime = cmd->convert_arg & 0xFFFF;
ui_ConvertTimeBase = cmd->convert_arg >> 16;
@@ -2868,34 +2868,34 @@ int i_APCI3200_CommandAnalogInput(struct comedi_device * dev, struct comedi_subd
ui_ConvertTimeBase = 0;
}
- // if(i_ADDIDATAType ==1 || ((i_ADDIDATAType==2)))
- // {
+ /* if(i_ADDIDATAType ==1 || ((i_ADDIDATAType==2))) */
+ /* { */
/**************************************************/
/*Read the old configuration of the current source */
/**************************************************/
- //ui_Configuration = inl(devpriv->iobase+i_Offset + 12);
+ /* ui_Configuration = inl(devpriv->iobase+i_Offset + 12); */
ui_Configuration =
inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
/***********************************************/
/*Write the configuration of the current source */
/***********************************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl((ui_Configuration & 0xFFC00000 ), devpriv->iobase+i_Offset +12);
+ /* outl((ui_Configuration & 0xFFC00000 ), devpriv->iobase+i_Offset +12); */
outl((ui_Configuration & 0xFFC00000),
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 12);
- // }
+ /* } */
ui_Configuration = 0;
- // printk("\nfirstchannel=%u\n",i_FirstChannel);
- // printk("\nlastchannel=%u\n",i_LastChannel);
- // printk("\nui_Trigger=%u\n",ui_Trigger);
- // printk("\nui_TriggerEdge=%u\n",ui_TriggerEdge);
- // printk("\nui_Triggermode=%u\n",ui_Triggermode);
- // printk("\nui_DelayMode=%u\n",ui_DelayMode);
- // printk("\nui_ScanMode=%u\n",ui_ScanMode);
-
- //ui_Configuration = i_FirstChannel |(i_LastChannel << 8)| 0x00100000 |
+ /* printk("\nfirstchannel=%u\n",i_FirstChannel); */
+ /* printk("\nlastchannel=%u\n",i_LastChannel); */
+ /* printk("\nui_Trigger=%u\n",ui_Trigger); */
+ /* printk("\nui_TriggerEdge=%u\n",ui_TriggerEdge); */
+ /* printk("\nui_Triggermode=%u\n",ui_Triggermode); */
+ /* printk("\nui_DelayMode=%u\n",ui_DelayMode); */
+ /* printk("\nui_ScanMode=%u\n",ui_ScanMode); */
+
+ /* ui_Configuration = i_FirstChannel |(i_LastChannel << 8)| 0x00100000 | */
ui_Configuration =
s_BoardInfos[dev->minor].i_FirstChannel | (s_BoardInfos[dev->
minor].
@@ -2906,80 +2906,80 @@ int i_APCI3200_CommandAnalogInput(struct comedi_device * dev, struct comedi_subd
/*************************/
/*Write the Configuration */
/*************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl( ui_Configuration, devpriv->iobase+i_Offset + 0x8);
+ /* outl( ui_Configuration, devpriv->iobase+i_Offset + 0x8); */
outl(ui_Configuration,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 0x8);
/***********************/
/*Write the Delay Value */
/***********************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(ui_DelayTime,devpriv->iobase+i_Offset + 40);
+ /* outl(ui_DelayTime,devpriv->iobase+i_Offset + 40); */
outl(ui_DelayTime,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 40);
/***************************/
/*Write the Delay time base */
/***************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(ui_DelayTimeBase,devpriv->iobase+i_Offset + 44);
+ /* outl(ui_DelayTimeBase,devpriv->iobase+i_Offset + 44); */
outl(ui_DelayTimeBase,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 44);
/*********************************/
/*Write the conversion time value */
/*********************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(ui_ConvertTime,devpriv->iobase+i_Offset + 32);
+ /* outl(ui_ConvertTime,devpriv->iobase+i_Offset + 32); */
outl(ui_ConvertTime,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 32);
/********************************/
/*Write the conversion time base */
/********************************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(ui_ConvertTimeBase,devpriv->iobase+i_Offset + 36);
+ /* outl(ui_ConvertTimeBase,devpriv->iobase+i_Offset + 36); */
outl(ui_ConvertTimeBase,
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 36);
/*******************/
/*Read the register */
/*******************/
- //ui_Configuration = inl(devpriv->iobase+i_Offset + 4);
+ /* ui_Configuration = inl(devpriv->iobase+i_Offset + 4); */
ui_Configuration =
inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 4);
/******************/
/*Set the SCAN bit */
/******************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl(((ui_Configuration & 0x1E0FF) | 0x00002000),devpriv->iobase+i_Offset + 4);
+ /* outl(((ui_Configuration & 0x1E0FF) | 0x00002000),devpriv->iobase+i_Offset + 4); */
outl(((ui_Configuration & 0x1E0FF) | 0x00002000),
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 4);
/*******************/
/*Read the register */
/*******************/
ui_Configuration = 0;
- //ui_Configuration = inl(devpriv->iobase+i_Offset + 8);
+ /* ui_Configuration = inl(devpriv->iobase+i_Offset + 8); */
ui_Configuration =
inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 8);
/*******************/
/*Set the START bit */
/*******************/
- //while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1);
+ /* while (((inl(devpriv->iobase+i_Offset+12)>>19) & 1) != 1); */
while (((inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset +
12) >> 19) & 1) != 1) ;
- //outl((ui_Configuration | 0x00080000),devpriv->iobase+i_Offset + 8);
+ /* outl((ui_Configuration | 0x00080000),devpriv->iobase+i_Offset + 8); */
outl((ui_Configuration | 0x00080000),
devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 8);
return 0;
@@ -3005,10 +3005,10 @@ int i_APCI3200_Reset(struct comedi_device * dev)
{
int i_Temp;
unsigned int dw_Dummy;
- //i_InterruptFlag=0;
- //i_Initialised==0;
- //i_Count=0;
- //i_Sum=0;
+ /* i_InterruptFlag=0; */
+ /* i_Initialised==0; */
+ /* i_Count=0; */
+ /* i_Sum=0; */
s_BoardInfos[dev->minor].i_InterruptFlag = 0;
s_BoardInfos[dev->minor].i_Initialised = 0;
@@ -3018,17 +3018,17 @@ int i_APCI3200_Reset(struct comedi_device * dev)
outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);
- // Enable the interrupt for the controler
+ /* Enable the interrupt for the controler */
dw_Dummy = inl(devpriv->i_IobaseAmcc + 0x38);
outl(dw_Dummy | 0x2000, devpriv->i_IobaseAmcc + 0x38);
- outl(0, devpriv->i_IobaseAddon); //Resets the output
+ outl(0, devpriv->i_IobaseAddon); /* Resets the output */
/***************/
/*Empty the buffer */
/**************/
for (i_Temp = 0; i_Temp <= 95; i_Temp++) {
- //ui_InterruptChannelValue[i_Temp]=0;
+ /* ui_InterruptChannelValue[i_Temp]=0; */
s_BoardInfos[dev->minor].ui_InterruptChannelValue[i_Temp] = 0;
- } //for(i_Temp=0;i_Temp<=95;i_Temp++)
+ } /* for(i_Temp=0;i_Temp<=95;i_Temp++) */
/*****************************/
/*Reset the START and IRQ bit */
/*****************************/
@@ -3036,7 +3036,7 @@ int i_APCI3200_Reset(struct comedi_device * dev)
while (((inl(devpriv->iobase + i_Temp + 12) >> 19) & 1) != 1) ;
outl(0, devpriv->iobase + i_Temp + 8);
i_Temp = i_Temp + 64;
- } //for(i_Temp=0;i_Temp<=192;i_Temp+64)
+ } /* for(i_Temp=0;i_Temp<=192;i_Temp+64) */
return 0;
}
@@ -3069,17 +3069,17 @@ void v_APCI3200_Interrupt(int irq, void *d)
unsigned int ui_DigitalInput = 0;
int i_ConvertCJCCalibration;
- //BEGIN JK TEST
+ /* BEGIN JK TEST */
int i_ReturnValue = 0;
- //END JK TEST
+ /* END JK TEST */
- //printk ("\n i_ScanType = %i i_ADDIDATAType = %i", s_BoardInfos [dev->minor].i_ScanType, s_BoardInfos [dev->minor].i_ADDIDATAType);
+ /* printk ("\n i_ScanType = %i i_ADDIDATAType = %i", s_BoardInfos [dev->minor].i_ScanType, s_BoardInfos [dev->minor].i_ADDIDATAType); */
- //switch(i_ScanType)
+ /* switch(i_ScanType) */
switch (s_BoardInfos[dev->minor].i_ScanType) {
case 0:
case 1:
- //switch(i_ADDIDATAType)
+ /* switch(i_ADDIDATAType) */
switch (s_BoardInfos[dev->minor].i_ADDIDATAType) {
case 0:
case 1:
@@ -3087,12 +3087,12 @@ void v_APCI3200_Interrupt(int irq, void *d)
/************************************/
/*Read the interrupt status register */
/************************************/
- //ui_StatusRegister = inl(devpriv->iobase+i_Offset + 16);
+ /* ui_StatusRegister = inl(devpriv->iobase+i_Offset + 16); */
ui_StatusRegister =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 16);
if ((ui_StatusRegister & 0x2) == 0x2) {
- //i_CalibrationFlag = ((inl(devpriv->iobase+i_Offset + 12) & 0x00060000) >> 17);
+ /* i_CalibrationFlag = ((inl(devpriv->iobase+i_Offset + 12) & 0x00060000) >> 17); */
i_CalibrationFlag =
((inl(devpriv->iobase +
s_BoardInfos[dev->
@@ -3103,12 +3103,12 @@ void v_APCI3200_Interrupt(int irq, void *d)
/*************************/
/*Read the channel number */
/*************************/
- //ui_ChannelNumber = inl(devpriv->iobase+i_Offset + 24);
+ /* ui_ChannelNumber = inl(devpriv->iobase+i_Offset + 24); */
/*************************************/
/*Read the digital analog input value */
/*************************************/
- //ui_DigitalInput = inl(devpriv->iobase+i_Offset + 28);
+ /* ui_DigitalInput = inl(devpriv->iobase+i_Offset + 28); */
ui_DigitalInput =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 28);
@@ -3117,13 +3117,13 @@ void v_APCI3200_Interrupt(int irq, void *d)
/* Test if the value read is the channel value */
/***********************************************/
if (i_CalibrationFlag == 0) {
- //ui_InterruptChannelValue[i_Count + 0] = ui_DigitalInput;
+ /* ui_InterruptChannelValue[i_Count + 0] = ui_DigitalInput; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue
[s_BoardInfos[dev->minor].
i_Count + 0] = ui_DigitalInput;
- //Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
/*
printk("\n 1 - i_APCI3200_GetChannelCalibrationValue (dev, s_BoardInfos %i", ui_ChannelNumber);
i_APCI3200_GetChannelCalibrationValue (dev, s_BoardInfos [dev->minor].ui_Channel_num,
@@ -3131,14 +3131,14 @@ void v_APCI3200_Interrupt(int irq, void *d)
&s_BoardInfos [dev->minor].ui_InterruptChannelValue[s_BoardInfos [dev->minor].i_Count + 7],
&s_BoardInfos [dev->minor].ui_InterruptChannelValue[s_BoardInfos [dev->minor].i_Count + 8]);
*/
- //End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
/******************************************************/
/*Start the conversion of the calibration offset value */
/******************************************************/
i_APCI3200_ReadCalibrationOffsetValue
(dev, &ui_DummyValue);
- } //if (i_CalibrationFlag == 0)
+ } /* if (i_CalibrationFlag == 0) */
/**********************************************************/
/* Test if the value read is the calibration offset value */
/**********************************************************/
@@ -3149,7 +3149,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
/* Save the value */
/******************/
- //ui_InterruptChannelValue[i_Count + 1] = ui_DigitalInput;
+ /* ui_InterruptChannelValue[i_Count + 1] = ui_DigitalInput; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue
[s_BoardInfos[dev->minor].
@@ -3160,7 +3160,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
/******************************************************/
i_APCI3200_ReadCalibrationGainValue(dev,
&ui_DummyValue);
- } //if (i_CalibrationFlag == 1)
+ } /* if (i_CalibrationFlag == 1) */
/******************************************************/
/*Test if the value read is the calibration gain value */
/******************************************************/
@@ -3170,48 +3170,48 @@ void v_APCI3200_Interrupt(int irq, void *d)
/****************/
/*Save the value */
/****************/
- //ui_InterruptChannelValue[i_Count + 2] = ui_DigitalInput;
+ /* ui_InterruptChannelValue[i_Count + 2] = ui_DigitalInput; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue
[s_BoardInfos[dev->minor].
i_Count + 2] = ui_DigitalInput;
- //if(i_ScanType==1)
+ /* if(i_ScanType==1) */
if (s_BoardInfos[dev->minor].
i_ScanType == 1) {
- //i_InterruptFlag=0;
+ /* i_InterruptFlag=0; */
s_BoardInfos[dev->minor].
i_InterruptFlag = 0;
- //i_Count=i_Count + 6;
- //Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
- //s_BoardInfos [dev->minor].i_Count=s_BoardInfos [dev->minor].i_Count + 6;
+ /* i_Count=i_Count + 6; */
+ /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+ /* s_BoardInfos [dev->minor].i_Count=s_BoardInfos [dev->minor].i_Count + 6; */
s_BoardInfos[dev->minor].
i_Count =
s_BoardInfos[dev->
minor].i_Count + 9;
- //End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
- } //if(i_ScanType==1)
+ /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+ } /* if(i_ScanType==1) */
else {
- //i_Count=0;
+ /* i_Count=0; */
s_BoardInfos[dev->minor].
i_Count = 0;
- } //elseif(i_ScanType==1)
- //if(i_ScanType!=1)
+ } /* elseif(i_ScanType==1) */
+ /* if(i_ScanType!=1) */
if (s_BoardInfos[dev->minor].
i_ScanType != 1) {
- i_ReturnValue = send_sig(SIGIO, devpriv->tsk_Current, 0); // send signal to the sample
- } //if(i_ScanType!=1)
+ i_ReturnValue = send_sig(SIGIO, devpriv->tsk_Current, 0); /* send signal to the sample */
+ } /* if(i_ScanType!=1) */
else {
- //if(i_ChannelCount==i_Sum)
+ /* if(i_ChannelCount==i_Sum) */
if (s_BoardInfos[dev->minor].
i_ChannelCount ==
s_BoardInfos[dev->
minor].i_Sum) {
- send_sig(SIGIO, devpriv->tsk_Current, 0); // send signal to the sample
+ send_sig(SIGIO, devpriv->tsk_Current, 0); /* send signal to the sample */
}
- } //if(i_ScanType!=1)
- } //if (i_CalibrationFlag == 2)
- } // if ((ui_StatusRegister & 0x2) == 0x2)
+ } /* if(i_ScanType!=1) */
+ } /* if (i_CalibrationFlag == 2) */
+ } /* if ((ui_StatusRegister & 0x2) == 0x2) */
break;
@@ -3220,7 +3220,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
/*Read the interrupt status register */
/************************************/
- //ui_StatusRegister = inl(devpriv->iobase+i_Offset + 16);
+ /* ui_StatusRegister = inl(devpriv->iobase+i_Offset + 16); */
ui_StatusRegister =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 16);
@@ -3230,7 +3230,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
if ((ui_StatusRegister & 0x2) == 0x2) {
- //i_CJCFlag = ((inl(devpriv->iobase+i_Offset + 4) & 0x00000400) >> 10);
+ /* i_CJCFlag = ((inl(devpriv->iobase+i_Offset + 4) & 0x00000400) >> 10); */
i_CJCFlag =
((inl(devpriv->iobase +
s_BoardInfos[dev->
@@ -3238,7 +3238,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
i_Offset +
4) & 0x00000400) >> 10);
- //i_CalibrationFlag = ((inl(devpriv->iobase+i_Offset + 12) & 0x00060000) >> 17);
+ /* i_CalibrationFlag = ((inl(devpriv->iobase+i_Offset + 12) & 0x00060000) >> 17); */
i_CalibrationFlag =
((inl(devpriv->iobase +
s_BoardInfos[dev->
@@ -3251,19 +3251,19 @@ void v_APCI3200_Interrupt(int irq, void *d)
/*Read the channel number */
/*************************/
- //ui_ChannelNumber = inl(devpriv->iobase+i_Offset + 24);
+ /* ui_ChannelNumber = inl(devpriv->iobase+i_Offset + 24); */
ui_ChannelNumber =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 24);
- //Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
s_BoardInfos[dev->minor].ui_Channel_num =
ui_ChannelNumber;
- //End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
/************************************/
/*Read the digital temperature value */
/************************************/
- //ui_DigitalTemperature = inl(devpriv->iobase+i_Offset + 28);
+ /* ui_DigitalTemperature = inl(devpriv->iobase+i_Offset + 28); */
ui_DigitalTemperature =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 28);
@@ -3274,7 +3274,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
if ((i_CalibrationFlag == 0)
&& (i_CJCFlag == 0)) {
- //ui_InterruptChannelValue[i_Count + 0]=ui_DigitalTemperature;
+ /* ui_InterruptChannelValue[i_Count + 0]=ui_DigitalTemperature; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue
[s_BoardInfos[dev->minor].
@@ -3287,7 +3287,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
i_APCI3200_ReadCJCValue(dev,
&ui_DummyValue);
- } //if ((i_CalibrationFlag == 0) && (i_CJCFlag == 0))
+ } /* if ((i_CalibrationFlag == 0) && (i_CJCFlag == 0)) */
/*****************************************/
/*Test if the value read is the CJC value */
@@ -3295,7 +3295,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
if ((i_CJCFlag == 1)
&& (i_CalibrationFlag == 0)) {
- //ui_InterruptChannelValue[i_Count + 3]=ui_DigitalTemperature;
+ /* ui_InterruptChannelValue[i_Count + 3]=ui_DigitalTemperature; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue
[s_BoardInfos[dev->minor].
@@ -3307,7 +3307,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
/******************************************************/
i_APCI3200_ReadCalibrationOffsetValue
(dev, &ui_DummyValue);
- } // if ((i_CJCFlag == 1) && (i_CalibrationFlag == 0))
+ } /* if ((i_CJCFlag == 1) && (i_CalibrationFlag == 0)) */
/********************************************************/
/*Test if the value read is the calibration offset value */
@@ -3315,7 +3315,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
if ((i_CalibrationFlag == 1)
&& (i_CJCFlag == 0)) {
- //ui_InterruptChannelValue[i_Count + 1]=ui_DigitalTemperature;
+ /* ui_InterruptChannelValue[i_Count + 1]=ui_DigitalTemperature; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue
[s_BoardInfos[dev->minor].
@@ -3328,7 +3328,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
i_APCI3200_ReadCalibrationGainValue(dev,
&ui_DummyValue);
- } //if ((i_CalibrationFlag == 1) && (i_CJCFlag == 0))
+ } /* if ((i_CalibrationFlag == 1) && (i_CJCFlag == 0)) */
/******************************************************/
/*Test if the value read is the calibration gain value */
@@ -3336,7 +3336,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
if ((i_CalibrationFlag == 2)
&& (i_CJCFlag == 0)) {
- //ui_InterruptChannelValue[i_Count + 2]=ui_DigitalTemperature;
+ /* ui_InterruptChannelValue[i_Count + 2]=ui_DigitalTemperature; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue
[s_BoardInfos[dev->minor].
@@ -3349,15 +3349,15 @@ void v_APCI3200_Interrupt(int irq, void *d)
/*Test if the polarity is the same */
/**********************************/
- //if(i_CJCPolarity!=i_ADDIDATAPolarity)
+ /* if(i_CJCPolarity!=i_ADDIDATAPolarity) */
if (s_BoardInfos[dev->minor].
i_CJCPolarity !=
s_BoardInfos[dev->minor].
i_ADDIDATAPolarity) {
i_ConvertCJCCalibration = 1;
- } //if(i_CJCPolarity!=i_ADDIDATAPolarity)
+ } /* if(i_CJCPolarity!=i_ADDIDATAPolarity) */
else {
- //if(i_CJCGain==i_ADDIDATAGain)
+ /* if(i_CJCGain==i_ADDIDATAGain) */
if (s_BoardInfos[dev->minor].
i_CJCGain ==
s_BoardInfos[dev->
@@ -3365,12 +3365,12 @@ void v_APCI3200_Interrupt(int irq, void *d)
i_ADDIDATAGain) {
i_ConvertCJCCalibration
= 0;
- } //if(i_CJCGain==i_ADDIDATAGain)
+ } /* if(i_CJCGain==i_ADDIDATAGain) */
else {
i_ConvertCJCCalibration
= 1;
- } //elseif(i_CJCGain==i_ADDIDATAGain)
- } //elseif(i_CJCPolarity!=i_ADDIDATAPolarity)
+ } /* elseif(i_CJCGain==i_ADDIDATAGain) */
+ } /* elseif(i_CJCPolarity!=i_ADDIDATAPolarity) */
if (i_ConvertCJCCalibration == 1) {
/****************************************************************/
/*Start the conversion of the calibration gain value for the CJC */
@@ -3378,10 +3378,10 @@ void v_APCI3200_Interrupt(int irq, void *d)
i_APCI3200_ReadCJCCalOffset(dev,
&ui_DummyValue);
- } //if(i_ConvertCJCCalibration==1)
+ } /* if(i_ConvertCJCCalibration==1) */
else {
- //ui_InterruptChannelValue[i_Count + 4]=0;
- //ui_InterruptChannelValue[i_Count + 5]=0;
+ /* ui_InterruptChannelValue[i_Count + 4]=0; */
+ /* ui_InterruptChannelValue[i_Count + 5]=0; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue
[s_BoardInfos[dev->
@@ -3392,8 +3392,8 @@ void v_APCI3200_Interrupt(int irq, void *d)
[s_BoardInfos[dev->
minor].i_Count +
5] = 0;
- } //elseif(i_ConvertCJCCalibration==1)
- } //else if ((i_CalibrationFlag == 2) && (i_CJCFlag == 0))
+ } /* elseif(i_ConvertCJCCalibration==1) */
+ } /* else if ((i_CalibrationFlag == 2) && (i_CJCFlag == 0)) */
/********************************************************************/
/*Test if the value read is the calibration offset value for the CJC */
@@ -3401,7 +3401,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
if ((i_CalibrationFlag == 1)
&& (i_CJCFlag == 1)) {
- //ui_InterruptChannelValue[i_Count + 4]=ui_DigitalTemperature;
+ /* ui_InterruptChannelValue[i_Count + 4]=ui_DigitalTemperature; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue
[s_BoardInfos[dev->minor].
@@ -3414,7 +3414,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
i_APCI3200_ReadCJCCalGain(dev,
&ui_DummyValue);
- } //if ((i_CalibrationFlag == 1) && (i_CJCFlag == 1))
+ } /* if ((i_CalibrationFlag == 1) && (i_CJCFlag == 1)) */
/******************************************************************/
/*Test if the value read is the calibration gain value for the CJC */
@@ -3422,61 +3422,61 @@ void v_APCI3200_Interrupt(int irq, void *d)
if ((i_CalibrationFlag == 2)
&& (i_CJCFlag == 1)) {
- //ui_InterruptChannelValue[i_Count + 5]=ui_DigitalTemperature;
+ /* ui_InterruptChannelValue[i_Count + 5]=ui_DigitalTemperature; */
s_BoardInfos[dev->minor].
ui_InterruptChannelValue
[s_BoardInfos[dev->minor].
i_Count + 5] =
ui_DigitalTemperature;
- //if(i_ScanType==1)
+ /* if(i_ScanType==1) */
if (s_BoardInfos[dev->minor].
i_ScanType == 1) {
- //i_InterruptFlag=0;
+ /* i_InterruptFlag=0; */
s_BoardInfos[dev->minor].
i_InterruptFlag = 0;
- //i_Count=i_Count + 6;
- //Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
- //s_BoardInfos [dev->minor].i_Count=s_BoardInfos [dev->minor].i_Count + 6;
+ /* i_Count=i_Count + 6; */
+ /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+ /* s_BoardInfos [dev->minor].i_Count=s_BoardInfos [dev->minor].i_Count + 6; */
s_BoardInfos[dev->minor].
i_Count =
s_BoardInfos[dev->
minor].i_Count + 9;
- //End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
- } //if(i_ScanType==1)
+ /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
+ } /* if(i_ScanType==1) */
else {
- //i_Count=0;
+ /* i_Count=0; */
s_BoardInfos[dev->minor].
i_Count = 0;
- } //elseif(i_ScanType==1)
+ } /* elseif(i_ScanType==1) */
- //if(i_ScanType!=1)
+ /* if(i_ScanType!=1) */
if (s_BoardInfos[dev->minor].
i_ScanType != 1) {
- send_sig(SIGIO, devpriv->tsk_Current, 0); // send signal to the sample
- } //if(i_ScanType!=1)
+ send_sig(SIGIO, devpriv->tsk_Current, 0); /* send signal to the sample */
+ } /* if(i_ScanType!=1) */
else {
- //if(i_ChannelCount==i_Sum)
+ /* if(i_ChannelCount==i_Sum) */
if (s_BoardInfos[dev->minor].
i_ChannelCount ==
s_BoardInfos[dev->
minor].i_Sum) {
- send_sig(SIGIO, devpriv->tsk_Current, 0); // send signal to the sample
+ send_sig(SIGIO, devpriv->tsk_Current, 0); /* send signal to the sample */
- } //if(i_ChannelCount==i_Sum)
- } //else if(i_ScanType!=1)
- } //if ((i_CalibrationFlag == 2) && (i_CJCFlag == 1))
+ } /* if(i_ChannelCount==i_Sum) */
+ } /* else if(i_ScanType!=1) */
+ } /* if ((i_CalibrationFlag == 2) && (i_CJCFlag == 1)) */
- } //else if ((ui_StatusRegister & 0x2) == 0x2)
+ } /* else if ((ui_StatusRegister & 0x2) == 0x2) */
break;
- } //switch(i_ADDIDATAType)
+ } /* switch(i_ADDIDATAType) */
break;
case 2:
case 3:
i_APCI3200_InterruptHandleEos(dev);
break;
- } //switch(i_ScanType)
+ } /* switch(i_ScanType) */
return;
}
@@ -3504,17 +3504,17 @@ int i_APCI3200_InterruptHandleEos(struct comedi_device * dev)
unsigned int ui_StatusRegister = 0;
struct comedi_subdevice *s = dev->subdevices + 0;
- //BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
- //comedi_async *async = s->async;
- //UINT *data;
- //data=async->data+async->buf_int_ptr;//new samples added from here onwards
+ /* BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+ /* comedi_async *async = s->async; */
+ /* UINT *data; */
+ /* data=async->data+async->buf_int_ptr;//new samples added from here onwards */
int n = 0, i = 0;
- //END JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
+ /* END JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
/************************************/
/*Read the interrupt status register */
/************************************/
- //ui_StatusRegister = inl(devpriv->iobase+i_Offset + 16);
+ /* ui_StatusRegister = inl(devpriv->iobase+i_Offset + 16); */
ui_StatusRegister =
inl(devpriv->iobase + s_BoardInfos[dev->minor].i_Offset + 16);
@@ -3526,33 +3526,33 @@ int i_APCI3200_InterruptHandleEos(struct comedi_device * dev)
/*************************/
/*Read the channel number */
/*************************/
- //ui_ChannelNumber = inl(devpriv->iobase+i_Offset + 24);
- //BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
- //This value is not used
- //ui_ChannelNumber = inl(devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 24);
+ /* ui_ChannelNumber = inl(devpriv->iobase+i_Offset + 24); */
+ /* BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+ /* This value is not used */
+ /* ui_ChannelNumber = inl(devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 24); */
s->async->events = 0;
- //END JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
+ /* END JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
/*************************************/
/*Read the digital Analog Input value */
/*************************************/
- //data[i_Count] = inl(devpriv->iobase+i_Offset + 28);
- //Begin JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
- //data[s_BoardInfos [dev->minor].i_Count] = inl(devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 28);
+ /* data[i_Count] = inl(devpriv->iobase+i_Offset + 28); */
+ /* Begin JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+ /* data[s_BoardInfos [dev->minor].i_Count] = inl(devpriv->iobase+s_BoardInfos [dev->minor].i_Offset + 28); */
s_BoardInfos[dev->minor].ui_ScanValueArray[s_BoardInfos[dev->
minor].i_Count] =
inl(devpriv->iobase +
s_BoardInfos[dev->minor].i_Offset + 28);
- //End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
+ /* End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
- //if((i_Count == (i_LastChannel-i_FirstChannel+3)))
+ /* if((i_Count == (i_LastChannel-i_FirstChannel+3))) */
if ((s_BoardInfos[dev->minor].i_Count ==
(s_BoardInfos[dev->minor].i_LastChannel -
s_BoardInfos[dev->minor].
i_FirstChannel + 3))) {
- //Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* Begin JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
s_BoardInfos[dev->minor].i_Count++;
for (i = s_BoardInfos[dev->minor].i_FirstChannel;
@@ -3582,61 +3582,61 @@ int i_APCI3200_InterruptHandleEos(struct comedi_device * dev)
* 3) + 2]);
}
- //End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values
+ /* End JK 22.10.2004: APCI-3200 / APCI-3300 Reading of EEPROM values */
- //i_Count=-1;
+ /* i_Count=-1; */
s_BoardInfos[dev->minor].i_Count = -1;
- //async->buf_int_count+=(i_LastChannel-i_FirstChannel+4)*sizeof(unsigned int);
- //Begin JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
- //async->buf_int_count+=(s_BoardInfos [dev->minor].i_LastChannel-s_BoardInfos [dev->minor].i_FirstChannel+4)*sizeof(unsigned int);
- //End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
- //async->buf_int_ptr+=(i_LastChannel-i_FirstChannel+4)*sizeof(unsigned int);
- //Begin JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
- //async->buf_int_ptr+=(s_BoardInfos [dev->minor].i_LastChannel-s_BoardInfos [dev->minor].i_FirstChannel+4)*sizeof(unsigned int);
- //comedi_eos(dev,s);
+ /* async->buf_int_count+=(i_LastChannel-i_FirstChannel+4)*sizeof(unsigned int); */
+ /* Begin JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+ /* async->buf_int_count+=(s_BoardInfos [dev->minor].i_LastChannel-s_BoardInfos [dev->minor].i_FirstChannel+4)*sizeof(unsigned int); */
+ /* End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+ /* async->buf_int_ptr+=(i_LastChannel-i_FirstChannel+4)*sizeof(unsigned int); */
+ /* Begin JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+ /* async->buf_int_ptr+=(s_BoardInfos [dev->minor].i_LastChannel-s_BoardInfos [dev->minor].i_FirstChannel+4)*sizeof(unsigned int); */
+ /* comedi_eos(dev,s); */
- // Set the event type (Comedi Buffer End Of Scan)
+ /* Set the event type (Comedi Buffer End Of Scan) */
s->async->events |= COMEDI_CB_EOS;
- // Test if enougth memory is available and allocate it for 7 values
- //n = comedi_buf_write_alloc(s->async, 7*sizeof(unsigned int));
+ /* Test if enougth memory is available and allocate it for 7 values */
+ /* n = comedi_buf_write_alloc(s->async, 7*sizeof(unsigned int)); */
n = comedi_buf_write_alloc(s->async,
(7 + 12) * sizeof(unsigned int));
- // If not enougth memory available, event is set to Comedi Buffer Errror
+ /* If not enougth memory available, event is set to Comedi Buffer Errror */
if (n > ((7 + 12) * sizeof(unsigned int))) {
printk("\ncomedi_buf_write_alloc n = %i", n);
s->async->events |= COMEDI_CB_ERROR;
}
- // Write all 7 scan values in the comedi buffer
+ /* Write all 7 scan values in the comedi buffer */
comedi_buf_memcpy_to(s->async, 0,
(unsigned int *) s_BoardInfos[dev->minor].
ui_ScanValueArray, (7 + 12) * sizeof(unsigned int));
- // Update comedi buffer pinters indexes
+ /* Update comedi buffer pinters indexes */
comedi_buf_write_free(s->async,
(7 + 12) * sizeof(unsigned int));
- // Send events
+ /* Send events */
comedi_event(dev, s);
- //End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
-
- //BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
- //
- //if (s->async->buf_int_ptr>=s->async->data_len) // for buffer rool over
- // {
- // /* buffer rollover */
- // s->async->buf_int_ptr=0;
- // comedi_eobuf(dev,s);
- // }
- //End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68
+ /* End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+
+ /* BEGIN JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
+ /* */
+ /* if (s->async->buf_int_ptr>=s->async->data_len) // for buffer rool over */
+ /* { */
+ /* /* buffer rollover */ */
+ /* s->async->buf_int_ptr=0; */
+ /* comedi_eobuf(dev,s); */
+ /* } */
+ /* End JK 18.10.2004: APCI-3200 Driver update 0.7.57 -> 0.7.68 */
}
- //i_Count++;
+ /* i_Count++; */
s_BoardInfos[dev->minor].i_Count++;
}
- //i_InterruptFlag=0;
+ /* i_InterruptFlag=0; */
s_BoardInfos[dev->minor].i_InterruptFlag = 0;
return 0;
}
--
1.6.3.2
More information about the devel
mailing list