staging: comedi: addi_apci_1564: fix digital output 'insn_bits' function
This driver does not follow the comedi API. The digital output 'insn_bits' function is passed a mask value in data[0] indicating which output bits in data[1] are changing. The function is then supposed to update the outputs accordingly and then return the current state of the outputs in data[1]. Currently this driver uses the 'insn_write' function to update either a single or all the output channels. And it uses the 'insn_bits' function to read either a single or all the output channel states. Fix the 'insn_bits' function so it works like the comedi core expects. The core can then use the function to emulate the 'insn_read' and 'insn_write' functions for individual channels. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
Greg Kroah-Hartman
parent
6b5d432852
commit
a4a257039f
2 changed files with 15 additions and 239 deletions
|
|
@ -258,250 +258,27 @@ static int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev,
|
|||
return insn->n;
|
||||
}
|
||||
|
||||
/*
|
||||
+----------------------------------------------------------------------------+
|
||||
| Function Name : int i_APCI1564_WriteDigitalOutput |
|
||||
| (struct comedi_device *dev,struct comedi_subdevice *s, |
|
||||
| struct comedi_insn *insn,unsigned int *data) |
|
||||
+----------------------------------------------------------------------------+
|
||||
| Task : Writes port value To the selected port |
|
||||
+----------------------------------------------------------------------------+
|
||||
| Input Parameters : struct comedi_device *dev : Driver handle |
|
||||
| unsigned int ui_NoOfChannels : No Of Channels To Write |
|
||||
| unsigned int *data : Data Pointer to read status |
|
||||
+----------------------------------------------------------------------------+
|
||||
| Output Parameters : -- |
|
||||
+----------------------------------------------------------------------------+
|
||||
| Return Value : TRUE : No error occur |
|
||||
| : FALSE : Error occur. Return the error |
|
||||
| |
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
static int i_APCI1564_WriteDigitalOutput(struct comedi_device *dev,
|
||||
struct comedi_subdevice *s,
|
||||
struct comedi_insn *insn,
|
||||
unsigned int *data)
|
||||
static int apci1564_do_insn_bits(struct comedi_device *dev,
|
||||
struct comedi_subdevice *s,
|
||||
struct comedi_insn *insn,
|
||||
unsigned int *data)
|
||||
{
|
||||
struct addi_private *devpriv = dev->private;
|
||||
unsigned int ui_Temp, ui_Temp1;
|
||||
unsigned int ui_NoOfChannel;
|
||||
unsigned int mask = data[0];
|
||||
unsigned int bits = data[1];
|
||||
|
||||
ui_NoOfChannel = CR_CHAN(insn->chanspec);
|
||||
if (devpriv->b_OutputMemoryStatus) {
|
||||
ui_Temp =
|
||||
inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_OP +
|
||||
s->state = inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_OP +
|
||||
APCI1564_DIGITAL_OP_RW);
|
||||
} /* if (devpriv->b_OutputMemoryStatus ) */
|
||||
else {
|
||||
ui_Temp = 0;
|
||||
} /* else 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_IobaseAmcc + APCI1564_DIGITAL_OP +
|
||||
APCI1564_DIGITAL_OP_RW);
|
||||
} /* if (data[1]==0) */
|
||||
else {
|
||||
if (data[1] == 1) {
|
||||
switch (ui_NoOfChannel) {
|
||||
case 2:
|
||||
data[0] =
|
||||
(data[0] << (2 *
|
||||
data[2])) | ui_Temp;
|
||||
break;
|
||||
case 4:
|
||||
data[0] =
|
||||
(data[0] << (4 *
|
||||
data[2])) | ui_Temp;
|
||||
break;
|
||||
case 8:
|
||||
data[0] =
|
||||
(data[0] << (8 *
|
||||
data[2])) | ui_Temp;
|
||||
break;
|
||||
case 16:
|
||||
data[0] =
|
||||
(data[0] << (16 *
|
||||
data[2])) | ui_Temp;
|
||||
break;
|
||||
case 31:
|
||||
data[0] = data[0] | ui_Temp;
|
||||
break;
|
||||
default:
|
||||
comedi_error(dev, " chan spec wrong");
|
||||
return -EINVAL; /* "sorry channel spec wrong " */
|
||||
} /* switch (ui_NoOfChannels) */
|
||||
outl(data[0],
|
||||
devpriv->i_IobaseAmcc +
|
||||
APCI1564_DIGITAL_OP +
|
||||
APCI1564_DIGITAL_OP_RW);
|
||||
} /* if (data[1]==1) */
|
||||
else {
|
||||
printk("\nSpecified channel not supported\n");
|
||||
} /* else if (data[1]==1) */
|
||||
} /* else if (data[1]==0) */
|
||||
} /* if(data[3]==0) */
|
||||
else {
|
||||
if (data[3] == 1) {
|
||||
if (data[1] == 0) {
|
||||
data[0] = ~data[0] & 0x1;
|
||||
ui_Temp1 = 1;
|
||||
ui_Temp1 = ui_Temp1 << ui_NoOfChannel;
|
||||
ui_Temp = ui_Temp | ui_Temp1;
|
||||
data[0] =
|
||||
(data[0] << ui_NoOfChannel) ^
|
||||
0xffffffff;
|
||||
data[0] = data[0] & ui_Temp;
|
||||
outl(data[0],
|
||||
devpriv->i_IobaseAmcc +
|
||||
APCI1564_DIGITAL_OP +
|
||||
APCI1564_DIGITAL_OP_RW);
|
||||
} /* if (data[1]==0) */
|
||||
else {
|
||||
if (data[1] == 1) {
|
||||
switch (ui_NoOfChannel) {
|
||||
case 2:
|
||||
data[0] = ~data[0] & 0x3;
|
||||
ui_Temp1 = 3;
|
||||
ui_Temp1 =
|
||||
ui_Temp1 << 2 * data[2];
|
||||
ui_Temp = ui_Temp | ui_Temp1;
|
||||
data[0] =
|
||||
((data[0] << (2 *
|
||||
data
|
||||
[2])) ^
|
||||
0xffffffff) & ui_Temp;
|
||||
break;
|
||||
case 4:
|
||||
data[0] = ~data[0] & 0xf;
|
||||
ui_Temp1 = 15;
|
||||
ui_Temp1 =
|
||||
ui_Temp1 << 4 * data[2];
|
||||
ui_Temp = ui_Temp | ui_Temp1;
|
||||
data[0] =
|
||||
((data[0] << (4 *
|
||||
data
|
||||
[2])) ^
|
||||
0xffffffff) & ui_Temp;
|
||||
break;
|
||||
case 8:
|
||||
data[0] = ~data[0] & 0xff;
|
||||
ui_Temp1 = 255;
|
||||
ui_Temp1 =
|
||||
ui_Temp1 << 8 * data[2];
|
||||
ui_Temp = ui_Temp | ui_Temp1;
|
||||
data[0] =
|
||||
((data[0] << (8 *
|
||||
data
|
||||
[2])) ^
|
||||
0xffffffff) & ui_Temp;
|
||||
break;
|
||||
case 16:
|
||||
data[0] = ~data[0] & 0xffff;
|
||||
ui_Temp1 = 65535;
|
||||
ui_Temp1 =
|
||||
ui_Temp1 << 16 *
|
||||
data[2];
|
||||
ui_Temp = ui_Temp | ui_Temp1;
|
||||
data[0] =
|
||||
((data[0] << (16 *
|
||||
data
|
||||
[2])) ^
|
||||
0xffffffff) & ui_Temp;
|
||||
break;
|
||||
case 31:
|
||||
break;
|
||||
default:
|
||||
comedi_error(dev,
|
||||
" chan spec wrong");
|
||||
return -EINVAL; /* "sorry channel spec wrong " */
|
||||
} /* switch(ui_NoOfChannels) */
|
||||
outl(data[0],
|
||||
devpriv->i_IobaseAmcc +
|
||||
APCI1564_DIGITAL_OP +
|
||||
APCI1564_DIGITAL_OP_RW);
|
||||
} /* if (data[1]==1) */
|
||||
else {
|
||||
printk("\nSpecified channel not supported\n");
|
||||
} /* else if (data[1]==1) */
|
||||
} /* else if (data[1]==0) */
|
||||
} /* if (data[3]==1); */
|
||||
else {
|
||||
printk("\nSpecified functionality does not exist\n");
|
||||
return -EINVAL;
|
||||
} /* else if (data[3]==1) */
|
||||
} /* else if (data[3]==0) */
|
||||
return insn->n;
|
||||
}
|
||||
if (mask) {
|
||||
s->state &= ~mask;
|
||||
s->state |= (bits & mask);
|
||||
|
||||
/*
|
||||
+----------------------------------------------------------------------------+
|
||||
| Function Name : int i_APCI1564_ReadDigitalOutput |
|
||||
| (struct comedi_device *dev,struct comedi_subdevice *s, |
|
||||
| struct comedi_insn *insn,unsigned int *data) |
|
||||
+----------------------------------------------------------------------------+
|
||||
| Task : Read value of the selected channel or port |
|
||||
+----------------------------------------------------------------------------+
|
||||
| Input Parameters : struct comedi_device *dev : Driver handle |
|
||||
| unsigned int ui_NoOfChannels : No Of Channels To read |
|
||||
| unsigned int *data : Data Pointer to read status |
|
||||
+----------------------------------------------------------------------------+
|
||||
| Output Parameters : -- |
|
||||
+----------------------------------------------------------------------------+
|
||||
| Return Value : TRUE : No error occur |
|
||||
| : FALSE : Error occur. Return the error |
|
||||
| |
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
static int i_APCI1564_ReadDigitalOutput(struct comedi_device *dev,
|
||||
struct comedi_subdevice *s,
|
||||
struct comedi_insn *insn,
|
||||
unsigned int *data)
|
||||
{
|
||||
struct addi_private *devpriv = dev->private;
|
||||
unsigned int ui_Temp;
|
||||
unsigned int ui_NoOfChannel;
|
||||
outl(s->state, devpriv->i_IobaseAmcc + APCI1564_DIGITAL_OP +
|
||||
APCI1564_DIGITAL_OP_RW);
|
||||
}
|
||||
|
||||
ui_NoOfChannel = CR_CHAN(insn->chanspec);
|
||||
ui_Temp = data[0];
|
||||
*data = inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_OP +
|
||||
APCI1564_DIGITAL_OP_RW);
|
||||
if (ui_Temp == 0) {
|
||||
*data = (*data >> ui_NoOfChannel) & 0x1;
|
||||
} /* if (ui_Temp==0) */
|
||||
else {
|
||||
if (ui_Temp == 1) {
|
||||
switch (ui_NoOfChannel) {
|
||||
case 2:
|
||||
*data = (*data >> (2 * data[1])) & 3;
|
||||
break;
|
||||
data[1] = s->state;
|
||||
|
||||
case 4:
|
||||
*data = (*data >> (4 * data[1])) & 15;
|
||||
break;
|
||||
|
||||
case 8:
|
||||
*data = (*data >> (8 * data[1])) & 255;
|
||||
break;
|
||||
|
||||
case 16:
|
||||
*data = (*data >> (16 * data[1])) & 65535;
|
||||
break;
|
||||
|
||||
case 31:
|
||||
break;
|
||||
|
||||
default:
|
||||
comedi_error(dev, " chan spec wrong");
|
||||
return -EINVAL; /* "sorry channel spec wrong " */
|
||||
break;
|
||||
} /* switch(ui_NoOfChannels) */
|
||||
} /* if (ui_Temp==1) */
|
||||
else {
|
||||
printk("\nSpecified channel not supported \n");
|
||||
} /* else if (ui_Temp==1) */
|
||||
} /* else if (ui_Temp==0) */
|
||||
return insn->n;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,7 @@ static const struct addi_board apci1564_boardtypes[] = {
|
|||
.di_config = i_APCI1564_ConfigDigitalInput,
|
||||
.di_bits = apci1564_di_insn_bits,
|
||||
.do_config = i_APCI1564_ConfigDigitalOutput,
|
||||
.do_write = i_APCI1564_WriteDigitalOutput,
|
||||
.do_bits = i_APCI1564_ReadDigitalOutput,
|
||||
.do_bits = apci1564_do_insn_bits,
|
||||
.do_read = i_APCI1564_ReadInterruptStatus,
|
||||
.timer_config = i_APCI1564_ConfigTimerCounterWatchdog,
|
||||
.timer_write = i_APCI1564_StartStopWriteTimerCounterWatchdog,
|
||||
|
|
|
|||
Loading…
Reference in a new issue