Split out the comedi core bus specific support code so it can be
conditionally included in the build. Move the bus specific includes
from the comedi headers to the individual drivers.
Add comedi core support for auto attaching to comedi pcmcia drivers.
Convert the cb_das16_cs, das08_cs, and ni_daq_700 drivers to use the
auto_attach mechanism. The other comedi pcmcia drivers will be
converted later, they all have pending patches that are being
reviewed.
Tidy up the remaining general purpose driver attach/detach functions.
Move a couple comedi core internal function prototypes from comedidev.h
to comedi_internal.h so they are not exported globally.
v2: rebased to staging-next as of:
commit 682b911938f8c0e88c8204bb1178c2c7728d5661
Author: Ian Abbott <abbotti@xxxxxxxxx>
Date: Mon Jan 28 17:07:39 2013 +0000
staging: comedi: cleanup all board minors on module exit
H Hartley Sweeten (10):
staging: comedi: conditionally build in USB driver support
staging: comedi: conditionally build in PCI driver support
staging: comedi: conditionally build in PCMCIA driver support
staging: comedi: allow pcmcia drivers to auto attach
staging: comedi: cb_das16_cs: convert to auto attach
staging: comedi: das08_cs: convert to auto attach
staging: comedi: ni_daq_700: convert to auto attach
staging: comedi: tidy up the general purpose driver functions
staging: comedi: don't expose comedi_device_{attach,detach}
staging: comedi: don't expose comedi_proc_{init,cleanup}
drivers/staging/comedi/Kconfig | 18 +-
drivers/staging/comedi/Makefile | 17 +-
drivers/staging/comedi/comedi_internal.h | 26 ++-
drivers/staging/comedi/comedi_pci.c | 140 ++++++++++++
drivers/staging/comedi/comedi_pcmcia.c | 109 +++++++++
drivers/staging/comedi/comedi_usb.c | 106 +++++++++
drivers/staging/comedi/comedidev.h | 285 +++++++++++++-----------
drivers/staging/comedi/drivers.c | 196 +++-------------
drivers/staging/comedi/drivers/8255_pci.c | 2 +
drivers/staging/comedi/drivers/addi_apci_035.c | 2 +
drivers/staging/comedi/drivers/addi_apci_1032.c | 3 +
drivers/staging/comedi/drivers/addi_apci_1500.c | 2 +
drivers/staging/comedi/drivers/addi_apci_1516.c | 2 +
drivers/staging/comedi/drivers/addi_apci_1564.c | 2 +
drivers/staging/comedi/drivers/addi_apci_16xx.c | 2 +
drivers/staging/comedi/drivers/addi_apci_1710.c | 2 +
drivers/staging/comedi/drivers/addi_apci_2032.c | 3 +
drivers/staging/comedi/drivers/addi_apci_2200.c | 2 +
drivers/staging/comedi/drivers/addi_apci_3120.c | 2 +
drivers/staging/comedi/drivers/addi_apci_3200.c | 2 +
drivers/staging/comedi/drivers/addi_apci_3501.c | 4 +
drivers/staging/comedi/drivers/addi_apci_3xxx.c | 2 +
drivers/staging/comedi/drivers/adl_pci6208.c | 2 +
drivers/staging/comedi/drivers/adl_pci7x3x.c | 2 +
drivers/staging/comedi/drivers/adl_pci8164.c | 4 +-
drivers/staging/comedi/drivers/adl_pci9111.c | 5 +-
drivers/staging/comedi/drivers/adl_pci9118.c | 4 +-
drivers/staging/comedi/drivers/adv_pci1710.c | 1 +
drivers/staging/comedi/drivers/adv_pci1723.c | 2 +
drivers/staging/comedi/drivers/adv_pci_dio.c | 5 +-
drivers/staging/comedi/drivers/amplc_dio200.c | 1 +
drivers/staging/comedi/drivers/amplc_pc236.c | 1 +
drivers/staging/comedi/drivers/amplc_pc263.c | 2 +
drivers/staging/comedi/drivers/amplc_pci224.c | 1 +
drivers/staging/comedi/drivers/amplc_pci230.c | 5 +-
drivers/staging/comedi/drivers/cb_das16_cs.c | 115 ++++------
drivers/staging/comedi/drivers/cb_pcidas.c | 4 +-
drivers/staging/comedi/drivers/cb_pcidas64.c | 4 +-
drivers/staging/comedi/drivers/cb_pcidda.c | 2 +
drivers/staging/comedi/drivers/cb_pcimdas.c | 5 +-
drivers/staging/comedi/drivers/cb_pcimdda.c | 2 +
drivers/staging/comedi/drivers/contec_pci_dio.c | 2 +
drivers/staging/comedi/drivers/daqboard2000.c | 5 +-
drivers/staging/comedi/drivers/das08.c | 5 +-
drivers/staging/comedi/drivers/das08_cs.c | 133 ++++-------
drivers/staging/comedi/drivers/das16.c | 2 +
drivers/staging/comedi/drivers/dt3000.c | 4 +-
drivers/staging/comedi/drivers/dyna_pci10xx.c | 4 +-
drivers/staging/comedi/drivers/gsc_hpdi.c | 4 +-
drivers/staging/comedi/drivers/icp_multi.c | 6 +-
drivers/staging/comedi/drivers/jr3_pci.c | 8 +-
drivers/staging/comedi/drivers/ke_counter.c | 2 +
drivers/staging/comedi/drivers/me4000.c | 7 +-
drivers/staging/comedi/drivers/me_daq.c | 2 +
drivers/staging/comedi/drivers/mite.c | 5 +-
drivers/staging/comedi/drivers/ni_6527.c | 2 +
drivers/staging/comedi/drivers/ni_65xx.c | 3 +
drivers/staging/comedi/drivers/ni_660x.c | 3 +
drivers/staging/comedi/drivers/ni_670x.c | 2 +
drivers/staging/comedi/drivers/ni_daq_700.c | 107 +++------
drivers/staging/comedi/drivers/ni_labpc.c | 4 +-
drivers/staging/comedi/drivers/ni_pcidio.c | 2 +
drivers/staging/comedi/drivers/ni_pcimio.c | 4 +-
drivers/staging/comedi/drivers/pcmda12.c | 2 -
drivers/staging/comedi/drivers/pcmmio.c | 2 +-
drivers/staging/comedi/drivers/pcmuio.c | 2 +-
drivers/staging/comedi/drivers/rtd520.c | 3 +-
drivers/staging/comedi/drivers/s626.c | 1 +
drivers/staging/comedi/drivers/skel.c | 4 +-
69 files changed, 840 insertions(+), 586 deletions(-)
create mode 100644 drivers/staging/comedi/comedi_pci.c
create mode 100644 drivers/staging/comedi/comedi_pcmcia.c
create mode 100644 drivers/staging/comedi/comedi_usb.c
--
1.8.1.1.293.gfe73786
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
