The ni_labpc driver consists of all the "common" code for the National
Instruments Lab-PC series boards. These boards are available in ISA, PCI,
and PCMCIA bus versions. The PCMCIA bus support is split into a separate
module, ni_labpc_cs.c.
The common code in ni_labpc.c also includes the bus specific code needed
to attach to the ISA and PCI versions of the board. This makes the common
code a bit messy due some #ifdef'ery to handle bus specific code which
could be disabled due to the Kconfig options.
This patch series cleans up the common code in ni_labpc and removes some
of the cruft.
After this series is accepted, a followup series will split the ISA and PCI
bus specific code out to remove the #ifdef'ery.
v2: remove the patches that,
only allocated the necessary number of subdevices
split out the bus specific code
reorder/rework some of the patches
add some additional cleanup patches
H Hartley Sweeten (51):
staging: comedi: ni_labpc: rename labpc_board_struct
staging: comedi: ni_labpc: remove thisboard macro
staging: comedi: ni_labpc: add some whitespace to the *_driver declarations
staging: comedi: ni_labpc: remove forward declarations 1
staging: comedi: ni_labpc: remove forward declarations 2
staging: comedi: ni_labpc: move the analog output support functions
staging: comedi: ni_labpc: remove forward declarations 3
staging: comedi: ni_labpc: remove forward declarations 4
staging: comedi: ni_labpc: tidy up range table declarations
staging: comedi: ni_labpc: remove boardinfo data that is set to '0'
staging: comedi: ni_labpc: remove "dummy" pci boardinfo entry
staging: comedi: ni_labpc: cleanup the boardinfo
staging: comedi: ni_labpc: remove 'volatile' from private data
staging: comedi: ni_labpc: rename some of the private data variables
staging: comedi: ni_labpc: rename local var 'thisboard'
staging: comedi: ni_labpc: rename boardinfo 'memory_mapped_io'
staging: comedi: ni_labpc: introduce labpc_range_is_unipolar()
staging: comedi: ni_labpc: rename subdevice (*insn_{read,write}) functions
staging: comedi: ni_labpc: fix command support with analog input subdevice
staging: comedi: ni_labpc: fix 8255 dio subdevice init
staging: comedi: ni_labpc: tidy up subdevice init
staging: comedi: ni_labpc: move declaration of local var 'dma_flags'
staging: comedi: ni_labpc: use dev->board_name instead of DRV_NAME
staging: comedi: ni_labpc: remove DRV_NAME
staging: comedi: ni_labpc: move declaration of local var 'irq_flags'
staging: comedi: ni_labpc: remove unnecessary test of dev->irq
staging: comedi: ni_labpc: cleanup local var declarations in labpc_ai_cmd()
staging: comedi: ni_labpc: cleanup local var declarations in labpc_ai_insn_read()
staging: comedi: ni_labpc: introduce labpc_ai_set_chan_and_gain()
staging: comedi: ni_labpc: use labpc_cancel() to remove some common code
staging: comedi: ni_labpc: introduce labpc_setup_cmd6_reg()
staging: comedi: ni_labpc: introduce labpc_read_adc_fifo()
staging: comedi: ni_labpc: introduce labpc_ai_wait_for_data()
staging: comedi: ni_labpc: fix a > 80 char line issue
staging: comedi: ni_labpc: clean up multi-line comments
staging: comedi: ni_labpc: clean up register map
staging: comedi: ni_labpc: move a couple of the #define's
staging: comedi: ni_labpc: remove inline from labpc_counter_load()
staging: comedi: ni_labpc: introduce labpc_counter_set_mode()
staging: comedi: ni_labpc: cleanup labpc_counter_load() usage
staging: comedi: ni_labpc: return error from labpc_counter_set_mode()
staging: comedi: ni_labpc: allow board to attach without interrupt
staging: comedi: ni_labpc: allow board to attach without dma
staging: comedi: ni_labpc: dma requires an interrupt
staging: comedi: ni_labpc: remove board attach noise
staging: comedi: ni_labpc: cleanup trigger setting in labpc_ai_cmd()
staging: comedi: ni_labpc: return bool from labpc_use_continuous_mode()
staging: comedi: ni_labpc: fix labpc_eeprom_insn_read()
staging: comedi: ni_labpc: fix labpc_eeprom_insn_write()
staging: comedi: ni_labpc: fix labpc_calib_insn_read()
staging: comedi: ni_labpc: fix labpc_calib_insn_write()
drivers/staging/comedi/drivers/ni_labpc.c | 2627 ++++++++++++--------------
drivers/staging/comedi/drivers/ni_labpc.h | 24 +-
drivers/staging/comedi/drivers/ni_labpc_cs.c | 3 +-
3 files changed, 1223 insertions(+), 1431 deletions(-)
--
1.8.1.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
