staging: comedi: addi_apci_3501: 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 output channel or all the channels and the 'insn_bits' function to
read the state of either a single channel or all the channels.

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>

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
index 5408f0720c92e374e0bac7d96b03bd621954df7f..7a18ce704ba4e4d5793bc5679376e38cb8eb1e37 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
@@ -96,143 +96,25 @@ static int apci3501_di_insn_bits(struct comedi_device *dev,
        return insn->n;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI3501_WriteDigitalOutput                      |
-|                        (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : writes To the digital Output Subdevice                 |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     struct comedi_subdevice *s     : Subdevice Pointer            |
-|                     struct comedi_insn *insn       : Insn Structure Pointer       |
-|                     unsigned int *data          : Data Pointer contains        |
-|                                          configuration parameters as below |
-|                                                                            |
-+----------------------------------------------------------------------------+
-| Output Parameters :  --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                          : FALSE : Error occur. Return the error          |
-|                                                                               |
-+----------------------------------------------------------------------------+
-*/
-static int i_APCI3501_WriteDigitalOutput(struct comedi_device *dev,
-                                        struct comedi_subdevice *s,
-                                        struct comedi_insn *insn,
-                                        unsigned int *data)
+static int apci3501_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 = CR_CHAN(insn->chanspec);  /*  get the channel */
+       unsigned int mask = data[0];
+       unsigned int bits = data[1];
 
-       if (devpriv->b_OutputMemoryStatus) {
-               ui_Temp = inl(devpriv->iobase + APCI3501_DIGITAL_OP);
-       }                       /* if(devpriv->b_OutputMemoryStatus ) */
-       else {
-               ui_Temp = 0;
-       }                       /* if(devpriv->b_OutputMemoryStatus ) */
-       if (data[3] == 0) {
-               if (data[1] == 0) {
-                       data[0] = (data[0] << ui_NoOfChannel) | ui_Temp;
-                       outl(data[0], devpriv->iobase + APCI3501_DIGITAL_OP);
-               }               /* if(data[1]==0) */
-               else {
-                       if (data[1] == 1) {
-                               data[0] = (data[0] << (2 * data[2])) | ui_Temp;
-                               outl(data[0],
-                                       devpriv->iobase + APCI3501_DIGITAL_OP);
-                       }       /*  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[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->iobase + APCI3501_DIGITAL_OP);
-                       }       /* if(data[1]==0) */
-                       else {
-                               if (data[1] == 1) {
-                                       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;
-                                       outl(data[0],
-                                               devpriv->iobase +
-                                               APCI3501_DIGITAL_OP);
-                               }       /*  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 {
-                       printk("\nSpecified functionality does not exist\n");
-                       return -EINVAL;
-               }               /* if else data[3]==1) */
-       }                       /* if else data[3]==0) */
-       return insn->n;
-}
+       s->state = inl(devpriv->iobase + APCI3501_DIGITAL_OP);
+       if (mask) {
+               s->state &= ~mask;
+               s->state |= (bits & mask);
+
+               outl(s->state, devpriv->iobase + APCI3501_DIGITAL_OP);
+       }
+
+       data[1] = s->state;
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI3501_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_APCI3501_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;
-
-       ui_NoOfChannel = CR_CHAN(insn->chanspec);
-       ui_Temp = data[0];
-       *data = inl(devpriv->iobase + APCI3501_DIGITAL_OP);
-       if (ui_Temp == 0) {
-               *data = (*data >> ui_NoOfChannel) & 0x1;
-       }                       /*  if  (ui_Temp==0) */
-       else {
-               if (ui_Temp == 1) {
-                       *data = *data & 0x3;
-
-               }               /*  if  (ui_Temp==1) */
-               else {
-                       printk("\nSpecified channel not supported \n");
-               }               /*  else if (ui_Temp==1) */
-       }                       /*  else if  (ui_Temp==0) */
        return insn->n;
 }
 

diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index 6477416ff51a886f685b0ffd5027530bee99417c..b7899488df080435ffb90c0aff74e718773ff241 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -28,8 +28,7 @@ static const struct addi_board apci3501_boardtypes[] = {
                .ao_config              = i_APCI3501_ConfigAnalogOutput,
                .ao_write               = i_APCI3501_WriteAnalogOutput,
                .di_bits                = apci3501_di_insn_bits,
-               .do_write               = i_APCI3501_WriteDigitalOutput,
-               .do_bits                = i_APCI3501_ReadDigitalOutput,
+               .do_bits                = apci3501_do_insn_bits,
                .timer_config           = i_APCI3501_ConfigTimerCounterWatchdog,
                .timer_write            = i_APCI3501_StartStopWriteTimerCounterWatchdog,
                .timer_read             = i_APCI3501_ReadTimerCounterWatchdog,