linux.git/drivers/staging/comedi, branch v3.0-rc2

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2011-05-24T20:28:35+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: Make struct pcmcia_device_id const, sound drivers edition
  staging: pcmcia: Convert pcmcia_device_id declarations to const
  pcmcia: Convert pcmcia_device_id declarations to const
  pcmcia: Make declaration and uses of struct pcmcia_device_id const
  pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data

comedi vmk80xx: support comedi auto-configuration

2011-05-18T21:32:07+00:00

Add support for automatically associating a vmk8055 device with a
comedi device (previously the user had to use comedi_num_legacy_minors
to reserve device slots and then associate them with vmk8055 devices
using comedi_config).
Tested on multiple K8055s, but not on K8061s.

Signed-off-by: J. Ali Harlow 
Signed-off-by: Greg Kroah-Hartman

comedi vmk80xx: support bits instruction

2011-05-18T21:32:06+00:00

Calling comedi_dio_bifield2() returns EBUSY permanently. Implementing
the insn_bits call fixes the problem and is good in its own right since
one can then read and write to all the digitial lines at the same time.
Tested on a K8055, but not on a K8061.

Signed-off-by: J. Ali Harlow 
Signed-off-by: Greg Kroah-Hartman

comedi vmk80xx: extend rudimentary_check to check both directions

2011-05-18T21:32:06+00:00

rudimentary_check() can currently check whether the input or
output direction is currently available (no pending transaction),
but not both at the same time. We need this facility for do_bits().

Signed-off-by: J. Ali Harlow 
Signed-off-by: Greg Kroah-Hartman

comedi vmk80xx: simplify rinsn output calculation

2011-05-18T21:32:06+00:00

vmk80xx_di_rinsn() and vmk80xx_do_rinsn() extract the required channel
data by inconsistent and overly-complex algorithms. Simplify them both.

Signed-off-by: J. Ali Harlow 
Signed-off-by: Greg Kroah-Hartman

comedi vmk80xx: Digitial I/O should have a maxdata of 1

2011-05-18T21:32:05+00:00

Digitial input and output sub-devices were reporting a maxdata of
0x1F and 0xFF respectively. They should both be 1.

Signed-off-by: J. Ali Harlow 
Signed-off-by: Greg Kroah-Hartman

comedi vmk80xx: make rudimentary_check a static function

2011-05-18T21:32:04+00:00

rudimentary_check is a macro with side-effects (it returns
on error) which is contary to CodingStyle. Replace it with
a static function.

Signed-off-by: J. Ali Harlow 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: addi-data: Get rid of redundant ps_BoardInfo

2011-05-17T20:33:39+00:00

The ps_BoardInfo pointer in the device private data is redundant as we
can just use the this_board macro to access the same data, as is done
elsewhere in the code.  Get rid of the pointer and change the code to
use the this_board macro instead.

Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: addi-data: Don't overwrite read-only data

2011-05-17T20:33:39+00:00

The drivers for ADDI-DATA cards can override some static parameters for
the board type using information read from EEPROM.  Unfortunately, they
currently write the parameters from the EEPROM back to the shared,
read-only board data!  The problem has been masked during compilation by
type-casting away the const-ness of the data.

This patch changes the code to use an area in the private data for the
board instance to hold the parameters read from EEPROM (after
initializing the parameters from the static board data).  It also
changes the type-casts to the read-only data to preserve the const
qualifier.

Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: comedi: adv_pci_dio: Add a counter subdevice to PCI-1751

2011-05-17T20:33:39+00:00

The Advantech PCI-1751 has a 8254 counter chip on board.  Add it to the
device as a counter subdevice.  Apparently the counter can generate
interrupts although the driver does not currently use this capability.

Original patch by Ivan Russkih (Иван Русских) .

Signed-off-by: Ian Abbott 
Signed-off-by: Greg Kroah-Hartman