From 8ffdff6a8cfbdc174a3a390b6f825a277b5bb895 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 14 Apr 2021 10:58:10 +0200 Subject: staging: comedi: move out of staging directory The comedi code came into the kernel back in 2008, but traces its lifetime to much much earlier. It's been polished and buffed and there's really nothing preventing it from being part of the "real" portion of the kernel. So move it to drivers/comedi/ as it belongs there. Many thanks to the hundreds of developers who did the work to make this happen. Cc: Ian Abbott Cc: H Hartley Sweeten Link: https://lore.kernel.org/r/YHauop4u3sP6lz8j@kroah.com Signed-off-by: Greg Kroah-Hartman --- drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/comedi/Kconfig | 1355 +++++ drivers/comedi/Makefile | 15 + drivers/comedi/TODO | 12 + drivers/comedi/comedi.h | 1528 +++++ drivers/comedi/comedi_buf.c | 692 +++ drivers/comedi/comedi_fops.c | 3436 +++++++++++ drivers/comedi/comedi_internal.h | 73 + drivers/comedi/comedi_pci.c | 228 + drivers/comedi/comedi_pci.h | 57 + drivers/comedi/comedi_pcmcia.c | 209 + drivers/comedi/comedi_pcmcia.h | 49 + drivers/comedi/comedi_usb.c | 151 + drivers/comedi/comedi_usb.h | 42 + drivers/comedi/comedidev.h | 1054 ++++ drivers/comedi/comedilib.h | 26 + drivers/comedi/drivers.c | 1184 ++++ drivers/comedi/drivers/8255.c | 125 + drivers/comedi/drivers/8255.h | 42 + drivers/comedi/drivers/8255_pci.c | 295 + drivers/comedi/drivers/Makefile | 175 + drivers/comedi/drivers/addi_apci_1032.c | 396 ++ drivers/comedi/drivers/addi_apci_1500.c | 887 +++ drivers/comedi/drivers/addi_apci_1516.c | 216 + drivers/comedi/drivers/addi_apci_1564.c | 820 +++ drivers/comedi/drivers/addi_apci_16xx.c | 178 + drivers/comedi/drivers/addi_apci_2032.c | 330 + drivers/comedi/drivers/addi_apci_2200.c | 143 + drivers/comedi/drivers/addi_apci_3120.c | 1117 ++++ drivers/comedi/drivers/addi_apci_3501.c | 417 ++ drivers/comedi/drivers/addi_apci_3xxx.c | 961 +++ drivers/comedi/drivers/addi_tcw.h | 64 + drivers/comedi/drivers/addi_watchdog.c | 140 + drivers/comedi/drivers/addi_watchdog.h | 10 + drivers/comedi/drivers/adl_pci6208.c | 201 + drivers/comedi/drivers/adl_pci7x3x.c | 542 ++ drivers/comedi/drivers/adl_pci8164.c | 154 + drivers/comedi/drivers/adl_pci9111.c | 747 +++ drivers/comedi/drivers/adl_pci9118.c | 1736 ++++++ drivers/comedi/drivers/adq12b.c | 243 + drivers/comedi/drivers/adv_pci1710.c | 963 +++ drivers/comedi/drivers/adv_pci1720.c | 186 + drivers/comedi/drivers/adv_pci1723.c | 227 + drivers/comedi/drivers/adv_pci1724.c | 208 + drivers/comedi/drivers/adv_pci1760.c | 424 ++ drivers/comedi/drivers/adv_pci_dio.c | 801 +++ drivers/comedi/drivers/aio_aio12_8.c | 277 + drivers/comedi/drivers/aio_iiro_16.c | 235 + drivers/comedi/drivers/amcc_s5933.h | 175 + drivers/comedi/drivers/amplc_dio200.c | 265 + drivers/comedi/drivers/amplc_dio200.h | 46 + drivers/comedi/drivers/amplc_dio200_common.c | 858 +++ drivers/comedi/drivers/amplc_dio200_pci.c | 415 ++ drivers/comedi/drivers/amplc_pc236.c | 76 + drivers/comedi/drivers/amplc_pc236.h | 33 + drivers/comedi/drivers/amplc_pc236_common.c | 193 + drivers/comedi/drivers/amplc_pc263.c | 102 + drivers/comedi/drivers/amplc_pci224.c | 1143 ++++ drivers/comedi/drivers/amplc_pci230.c | 2575 ++++++++ drivers/comedi/drivers/amplc_pci236.c | 144 + drivers/comedi/drivers/amplc_pci263.c | 111 + drivers/comedi/drivers/c6xdigio.c | 298 + drivers/comedi/drivers/cb_das16_cs.c | 456 ++ drivers/comedi/drivers/cb_pcidas.c | 1499 +++++ drivers/comedi/drivers/cb_pcidas64.c | 4119 +++++++++++++ drivers/comedi/drivers/cb_pcidda.c | 421 ++ drivers/comedi/drivers/cb_pcimdas.c | 475 ++ drivers/comedi/drivers/cb_pcimdda.c | 192 + drivers/comedi/drivers/comedi_8254.c | 655 ++ drivers/comedi/drivers/comedi_8254.h | 134 + drivers/comedi/drivers/comedi_8255.c | 276 + drivers/comedi/drivers/comedi_bond.c | 347 ++ drivers/comedi/drivers/comedi_isadma.c | 267 + drivers/comedi/drivers/comedi_isadma.h | 114 + drivers/comedi/drivers/comedi_parport.c | 306 + drivers/comedi/drivers/comedi_test.c | 849 +++ drivers/comedi/drivers/contec_pci_dio.c | 117 + drivers/comedi/drivers/dac02.c | 137 + drivers/comedi/drivers/daqboard2000.c | 787 +++ drivers/comedi/drivers/das08.c | 470 ++ drivers/comedi/drivers/das08.h | 46 + drivers/comedi/drivers/das08_cs.c | 104 + drivers/comedi/drivers/das08_isa.c | 190 + drivers/comedi/drivers/das08_pci.c | 96 + drivers/comedi/drivers/das16.c | 1200 ++++ drivers/comedi/drivers/das16m1.c | 622 ++ drivers/comedi/drivers/das1800.c | 1364 +++++ drivers/comedi/drivers/das6402.c | 669 +++ drivers/comedi/drivers/das800.c | 744 +++ drivers/comedi/drivers/dmm32at.c | 616 ++ drivers/comedi/drivers/dt2801.c | 645 ++ drivers/comedi/drivers/dt2811.c | 645 ++ drivers/comedi/drivers/dt2814.c | 372 ++ drivers/comedi/drivers/dt2815.c | 217 + drivers/comedi/drivers/dt2817.c | 140 + drivers/comedi/drivers/dt282x.c | 1172 ++++ drivers/comedi/drivers/dt3000.c | 740 +++ drivers/comedi/drivers/dt9812.c | 871 +++ drivers/comedi/drivers/dyna_pci10xx.c | 265 + drivers/comedi/drivers/fl512.c | 143 + drivers/comedi/drivers/gsc_hpdi.c | 723 +++ drivers/comedi/drivers/icp_multi.c | 336 ++ drivers/comedi/drivers/ii_pci20kc.c | 524 ++ drivers/comedi/drivers/jr3_pci.c | 816 +++ drivers/comedi/drivers/jr3_pci.h | 735 +++ drivers/comedi/drivers/ke_counter.c | 232 + drivers/comedi/drivers/me4000.c | 1278 ++++ drivers/comedi/drivers/me_daq.c | 556 ++ drivers/comedi/drivers/mf6x4.c | 311 + drivers/comedi/drivers/mite.c | 938 +++ drivers/comedi/drivers/mite.h | 93 + drivers/comedi/drivers/mpc624.c | 311 + drivers/comedi/drivers/multiq3.c | 332 + drivers/comedi/drivers/ni_6527.c | 493 ++ drivers/comedi/drivers/ni_65xx.c | 823 +++ drivers/comedi/drivers/ni_660x.c | 1255 ++++ drivers/comedi/drivers/ni_670x.c | 282 + drivers/comedi/drivers/ni_at_a2150.c | 782 +++ drivers/comedi/drivers/ni_at_ao.c | 374 ++ drivers/comedi/drivers/ni_atmio.c | 360 ++ drivers/comedi/drivers/ni_atmio16d.c | 729 +++ drivers/comedi/drivers/ni_daq_700.c | 280 + drivers/comedi/drivers/ni_daq_dio24.c | 82 + drivers/comedi/drivers/ni_labpc.c | 116 + drivers/comedi/drivers/ni_labpc.h | 55 + drivers/comedi/drivers/ni_labpc_common.c | 1363 +++++ drivers/comedi/drivers/ni_labpc_cs.c | 112 + drivers/comedi/drivers/ni_labpc_isadma.c | 181 + drivers/comedi/drivers/ni_labpc_isadma.h | 43 + drivers/comedi/drivers/ni_labpc_pci.c | 132 + drivers/comedi/drivers/ni_labpc_regs.h | 76 + drivers/comedi/drivers/ni_mio_common.c | 6341 ++++++++++++++++++++ drivers/comedi/drivers/ni_mio_cs.c | 218 + drivers/comedi/drivers/ni_pcidio.c | 1010 ++++ drivers/comedi/drivers/ni_pcimio.c | 1477 +++++ drivers/comedi/drivers/ni_routes.c | 562 ++ drivers/comedi/drivers/ni_routes.h | 330 + drivers/comedi/drivers/ni_routing/README | 240 + .../comedi/drivers/ni_routing/ni_device_routes.c | 51 + .../comedi/drivers/ni_routing/ni_device_routes.h | 32 + .../drivers/ni_routing/ni_device_routes/all.h | 54 + .../ni_routing/ni_device_routes/pci-6070e.c | 639 ++ .../drivers/ni_routing/ni_device_routes/pci-6220.c | 1418 +++++ .../drivers/ni_routing/ni_device_routes/pci-6221.c | 1602 +++++ .../drivers/ni_routing/ni_device_routes/pci-6229.c | 1602 +++++ .../drivers/ni_routing/ni_device_routes/pci-6251.c | 1652 +++++ .../drivers/ni_routing/ni_device_routes/pci-6254.c | 1464 +++++ .../drivers/ni_routing/ni_device_routes/pci-6259.c | 1652 +++++ .../drivers/ni_routing/ni_device_routes/pci-6534.c | 290 + .../drivers/ni_routing/ni_device_routes/pci-6602.c | 3378 +++++++++++ .../drivers/ni_routing/ni_device_routes/pci-6713.c | 400 ++ .../drivers/ni_routing/ni_device_routes/pci-6723.c | 400 ++ .../drivers/ni_routing/ni_device_routes/pci-6733.c | 428 ++ .../ni_routing/ni_device_routes/pxi-6030e.c | 608 ++ .../drivers/ni_routing/ni_device_routes/pxi-6224.c | 1432 +++++ .../drivers/ni_routing/ni_device_routes/pxi-6225.c | 1613 +++++ .../drivers/ni_routing/ni_device_routes/pxi-6251.c | 1655 +++++ .../drivers/ni_routing/ni_device_routes/pxi-6733.c | 428 ++ .../ni_routing/ni_device_routes/pxie-6251.c | 1656 +++++ .../ni_routing/ni_device_routes/pxie-6535.c | 575 ++ .../ni_routing/ni_device_routes/pxie-6738.c | 3083 ++++++++++ .../comedi/drivers/ni_routing/ni_route_values.c | 42 + .../comedi/drivers/ni_routing/ni_route_values.h | 98 + .../drivers/ni_routing/ni_route_values/all.h | 37 + .../drivers/ni_routing/ni_route_values/ni_660x.c | 650 ++ .../ni_routing/ni_route_values/ni_eseries.c | 602 ++ .../ni_routing/ni_route_values/ni_mseries.c | 1752 ++++++ drivers/comedi/drivers/ni_routing/tools/.gitignore | 8 + drivers/comedi/drivers/ni_routing/tools/Makefile | 80 + .../drivers/ni_routing/tools/convert_c_to_py.c | 159 + .../drivers/ni_routing/tools/convert_csv_to_c.py | 503 ++ .../drivers/ni_routing/tools/convert_py_to_csv.py | 67 + .../drivers/ni_routing/tools/csv_collection.py | 40 + .../drivers/ni_routing/tools/make_blank_csv.py | 32 + .../comedi/drivers/ni_routing/tools/ni_names.py | 56 + drivers/comedi/drivers/ni_stc.h | 1142 ++++ drivers/comedi/drivers/ni_tio.c | 1842 ++++++ drivers/comedi/drivers/ni_tio.h | 181 + drivers/comedi/drivers/ni_tio_internal.h | 176 + drivers/comedi/drivers/ni_tiocmd.c | 510 ++ drivers/comedi/drivers/ni_usb6501.c | 602 ++ drivers/comedi/drivers/pcl711.c | 513 ++ drivers/comedi/drivers/pcl724.c | 153 + drivers/comedi/drivers/pcl726.c | 425 ++ drivers/comedi/drivers/pcl730.c | 350 ++ drivers/comedi/drivers/pcl812.c | 1336 +++++ drivers/comedi/drivers/pcl816.c | 696 +++ drivers/comedi/drivers/pcl818.c | 1137 ++++ drivers/comedi/drivers/pcm3724.c | 227 + drivers/comedi/drivers/pcmad.c | 149 + drivers/comedi/drivers/pcmda12.c | 165 + drivers/comedi/drivers/pcmmio.c | 777 +++ drivers/comedi/drivers/pcmuio.c | 624 ++ drivers/comedi/drivers/plx9052.h | 70 + drivers/comedi/drivers/plx9080.h | 656 ++ drivers/comedi/drivers/quatech_daqp_cs.c | 842 +++ drivers/comedi/drivers/rtd520.c | 1365 +++++ drivers/comedi/drivers/rti800.c | 357 ++ drivers/comedi/drivers/rti802.c | 120 + drivers/comedi/drivers/s526.c | 629 ++ drivers/comedi/drivers/s626.c | 2605 ++++++++ drivers/comedi/drivers/s626.h | 869 +++ drivers/comedi/drivers/ssv_dnp.c | 180 + drivers/comedi/drivers/tests/Makefile | 8 + drivers/comedi/drivers/tests/comedi_example_test.c | 72 + drivers/comedi/drivers/tests/ni_routes_test.c | 611 ++ drivers/comedi/drivers/tests/unittest.h | 63 + drivers/comedi/drivers/usbdux.c | 1729 ++++++ drivers/comedi/drivers/usbduxfast.c | 1039 ++++ drivers/comedi/drivers/usbduxsigma.c | 1616 +++++ drivers/comedi/drivers/vmk80xx.c | 880 +++ drivers/comedi/drivers/z8536.h | 210 + drivers/comedi/kcomedilib/Makefile | 6 + drivers/comedi/kcomedilib/kcomedilib_main.c | 255 + drivers/comedi/proc.c | 74 + drivers/comedi/range.c | 131 + drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/comedi/Kconfig | 1355 ----- drivers/staging/comedi/Makefile | 15 - drivers/staging/comedi/TODO | 12 - drivers/staging/comedi/comedi.h | 1528 ----- drivers/staging/comedi/comedi_buf.c | 692 --- drivers/staging/comedi/comedi_fops.c | 3436 ----------- drivers/staging/comedi/comedi_internal.h | 73 - drivers/staging/comedi/comedi_pci.c | 228 - drivers/staging/comedi/comedi_pci.h | 57 - drivers/staging/comedi/comedi_pcmcia.c | 209 - drivers/staging/comedi/comedi_pcmcia.h | 49 - drivers/staging/comedi/comedi_usb.c | 151 - drivers/staging/comedi/comedi_usb.h | 42 - drivers/staging/comedi/comedidev.h | 1054 ---- drivers/staging/comedi/comedilib.h | 26 - drivers/staging/comedi/drivers.c | 1184 ---- drivers/staging/comedi/drivers/8255.c | 125 - drivers/staging/comedi/drivers/8255.h | 42 - drivers/staging/comedi/drivers/8255_pci.c | 295 - drivers/staging/comedi/drivers/Makefile | 175 - drivers/staging/comedi/drivers/addi_apci_1032.c | 396 -- drivers/staging/comedi/drivers/addi_apci_1500.c | 887 --- drivers/staging/comedi/drivers/addi_apci_1516.c | 216 - drivers/staging/comedi/drivers/addi_apci_1564.c | 820 --- drivers/staging/comedi/drivers/addi_apci_16xx.c | 178 - drivers/staging/comedi/drivers/addi_apci_2032.c | 330 - drivers/staging/comedi/drivers/addi_apci_2200.c | 143 - drivers/staging/comedi/drivers/addi_apci_3120.c | 1117 ---- drivers/staging/comedi/drivers/addi_apci_3501.c | 417 -- drivers/staging/comedi/drivers/addi_apci_3xxx.c | 961 --- drivers/staging/comedi/drivers/addi_tcw.h | 64 - drivers/staging/comedi/drivers/addi_watchdog.c | 140 - drivers/staging/comedi/drivers/addi_watchdog.h | 10 - drivers/staging/comedi/drivers/adl_pci6208.c | 201 - drivers/staging/comedi/drivers/adl_pci7x3x.c | 542 -- drivers/staging/comedi/drivers/adl_pci8164.c | 154 - drivers/staging/comedi/drivers/adl_pci9111.c | 747 --- drivers/staging/comedi/drivers/adl_pci9118.c | 1736 ------ drivers/staging/comedi/drivers/adq12b.c | 243 - drivers/staging/comedi/drivers/adv_pci1710.c | 963 --- drivers/staging/comedi/drivers/adv_pci1720.c | 186 - drivers/staging/comedi/drivers/adv_pci1723.c | 227 - drivers/staging/comedi/drivers/adv_pci1724.c | 208 - drivers/staging/comedi/drivers/adv_pci1760.c | 424 -- drivers/staging/comedi/drivers/adv_pci_dio.c | 801 --- drivers/staging/comedi/drivers/aio_aio12_8.c | 277 - drivers/staging/comedi/drivers/aio_iiro_16.c | 235 - drivers/staging/comedi/drivers/amcc_s5933.h | 175 - drivers/staging/comedi/drivers/amplc_dio200.c | 265 - drivers/staging/comedi/drivers/amplc_dio200.h | 46 - .../staging/comedi/drivers/amplc_dio200_common.c | 858 --- drivers/staging/comedi/drivers/amplc_dio200_pci.c | 415 -- drivers/staging/comedi/drivers/amplc_pc236.c | 76 - drivers/staging/comedi/drivers/amplc_pc236.h | 33 - .../staging/comedi/drivers/amplc_pc236_common.c | 193 - drivers/staging/comedi/drivers/amplc_pc263.c | 102 - drivers/staging/comedi/drivers/amplc_pci224.c | 1143 ---- drivers/staging/comedi/drivers/amplc_pci230.c | 2575 -------- drivers/staging/comedi/drivers/amplc_pci236.c | 144 - drivers/staging/comedi/drivers/amplc_pci263.c | 111 - drivers/staging/comedi/drivers/c6xdigio.c | 298 - drivers/staging/comedi/drivers/cb_das16_cs.c | 456 -- drivers/staging/comedi/drivers/cb_pcidas.c | 1499 ----- drivers/staging/comedi/drivers/cb_pcidas64.c | 4119 ------------- drivers/staging/comedi/drivers/cb_pcidda.c | 421 -- drivers/staging/comedi/drivers/cb_pcimdas.c | 475 -- drivers/staging/comedi/drivers/cb_pcimdda.c | 192 - drivers/staging/comedi/drivers/comedi_8254.c | 655 -- drivers/staging/comedi/drivers/comedi_8254.h | 134 - drivers/staging/comedi/drivers/comedi_8255.c | 276 - drivers/staging/comedi/drivers/comedi_bond.c | 347 -- drivers/staging/comedi/drivers/comedi_isadma.c | 267 - drivers/staging/comedi/drivers/comedi_isadma.h | 114 - drivers/staging/comedi/drivers/comedi_parport.c | 306 - drivers/staging/comedi/drivers/comedi_test.c | 849 --- drivers/staging/comedi/drivers/contec_pci_dio.c | 117 - drivers/staging/comedi/drivers/dac02.c | 137 - drivers/staging/comedi/drivers/daqboard2000.c | 787 --- drivers/staging/comedi/drivers/das08.c | 470 -- drivers/staging/comedi/drivers/das08.h | 46 - drivers/staging/comedi/drivers/das08_cs.c | 104 - drivers/staging/comedi/drivers/das08_isa.c | 190 - drivers/staging/comedi/drivers/das08_pci.c | 96 - drivers/staging/comedi/drivers/das16.c | 1200 ---- drivers/staging/comedi/drivers/das16m1.c | 622 -- drivers/staging/comedi/drivers/das1800.c | 1364 ----- drivers/staging/comedi/drivers/das6402.c | 669 --- drivers/staging/comedi/drivers/das800.c | 744 --- drivers/staging/comedi/drivers/dmm32at.c | 616 -- drivers/staging/comedi/drivers/dt2801.c | 645 -- drivers/staging/comedi/drivers/dt2811.c | 645 -- drivers/staging/comedi/drivers/dt2814.c | 372 -- drivers/staging/comedi/drivers/dt2815.c | 217 - drivers/staging/comedi/drivers/dt2817.c | 140 - drivers/staging/comedi/drivers/dt282x.c | 1172 ---- drivers/staging/comedi/drivers/dt3000.c | 740 --- drivers/staging/comedi/drivers/dt9812.c | 871 --- drivers/staging/comedi/drivers/dyna_pci10xx.c | 265 - drivers/staging/comedi/drivers/fl512.c | 143 - drivers/staging/comedi/drivers/gsc_hpdi.c | 723 --- drivers/staging/comedi/drivers/icp_multi.c | 336 -- drivers/staging/comedi/drivers/ii_pci20kc.c | 524 -- drivers/staging/comedi/drivers/jr3_pci.c | 816 --- drivers/staging/comedi/drivers/jr3_pci.h | 735 --- drivers/staging/comedi/drivers/ke_counter.c | 232 - drivers/staging/comedi/drivers/me4000.c | 1278 ---- drivers/staging/comedi/drivers/me_daq.c | 556 -- drivers/staging/comedi/drivers/mf6x4.c | 311 - drivers/staging/comedi/drivers/mite.c | 938 --- drivers/staging/comedi/drivers/mite.h | 93 - drivers/staging/comedi/drivers/mpc624.c | 311 - drivers/staging/comedi/drivers/multiq3.c | 332 - drivers/staging/comedi/drivers/ni_6527.c | 493 -- drivers/staging/comedi/drivers/ni_65xx.c | 823 --- drivers/staging/comedi/drivers/ni_660x.c | 1255 ---- drivers/staging/comedi/drivers/ni_670x.c | 282 - drivers/staging/comedi/drivers/ni_at_a2150.c | 782 --- drivers/staging/comedi/drivers/ni_at_ao.c | 374 -- drivers/staging/comedi/drivers/ni_atmio.c | 360 -- drivers/staging/comedi/drivers/ni_atmio16d.c | 729 --- drivers/staging/comedi/drivers/ni_daq_700.c | 280 - drivers/staging/comedi/drivers/ni_daq_dio24.c | 82 - drivers/staging/comedi/drivers/ni_labpc.c | 116 - drivers/staging/comedi/drivers/ni_labpc.h | 55 - drivers/staging/comedi/drivers/ni_labpc_common.c | 1363 ----- drivers/staging/comedi/drivers/ni_labpc_cs.c | 112 - drivers/staging/comedi/drivers/ni_labpc_isadma.c | 181 - drivers/staging/comedi/drivers/ni_labpc_isadma.h | 43 - drivers/staging/comedi/drivers/ni_labpc_pci.c | 132 - drivers/staging/comedi/drivers/ni_labpc_regs.h | 76 - drivers/staging/comedi/drivers/ni_mio_common.c | 6341 -------------------- drivers/staging/comedi/drivers/ni_mio_cs.c | 218 - drivers/staging/comedi/drivers/ni_pcidio.c | 1010 ---- drivers/staging/comedi/drivers/ni_pcimio.c | 1477 ----- drivers/staging/comedi/drivers/ni_routes.c | 562 -- drivers/staging/comedi/drivers/ni_routes.h | 330 - drivers/staging/comedi/drivers/ni_routing/README | 240 - .../comedi/drivers/ni_routing/ni_device_routes.c | 51 - .../comedi/drivers/ni_routing/ni_device_routes.h | 32 - .../drivers/ni_routing/ni_device_routes/all.h | 54 - .../ni_routing/ni_device_routes/pci-6070e.c | 639 -- .../drivers/ni_routing/ni_device_routes/pci-6220.c | 1418 ----- .../drivers/ni_routing/ni_device_routes/pci-6221.c | 1602 ----- .../drivers/ni_routing/ni_device_routes/pci-6229.c | 1602 ----- .../drivers/ni_routing/ni_device_routes/pci-6251.c | 1652 ----- .../drivers/ni_routing/ni_device_routes/pci-6254.c | 1464 ----- .../drivers/ni_routing/ni_device_routes/pci-6259.c | 1652 ----- .../drivers/ni_routing/ni_device_routes/pci-6534.c | 290 - .../drivers/ni_routing/ni_device_routes/pci-6602.c | 3378 ----------- .../drivers/ni_routing/ni_device_routes/pci-6713.c | 400 -- .../drivers/ni_routing/ni_device_routes/pci-6723.c | 400 -- .../drivers/ni_routing/ni_device_routes/pci-6733.c | 428 -- .../ni_routing/ni_device_routes/pxi-6030e.c | 608 -- .../drivers/ni_routing/ni_device_routes/pxi-6224.c | 1432 ----- .../drivers/ni_routing/ni_device_routes/pxi-6225.c | 1613 ----- .../drivers/ni_routing/ni_device_routes/pxi-6251.c | 1655 ----- .../drivers/ni_routing/ni_device_routes/pxi-6733.c | 428 -- .../ni_routing/ni_device_routes/pxie-6251.c | 1656 ----- .../ni_routing/ni_device_routes/pxie-6535.c | 575 -- .../ni_routing/ni_device_routes/pxie-6738.c | 3083 ---------- .../comedi/drivers/ni_routing/ni_route_values.c | 42 - .../comedi/drivers/ni_routing/ni_route_values.h | 98 - .../drivers/ni_routing/ni_route_values/all.h | 37 - .../drivers/ni_routing/ni_route_values/ni_660x.c | 650 -- .../ni_routing/ni_route_values/ni_eseries.c | 602 -- .../ni_routing/ni_route_values/ni_mseries.c | 1752 ------ .../comedi/drivers/ni_routing/tools/.gitignore | 8 - .../comedi/drivers/ni_routing/tools/Makefile | 80 - .../drivers/ni_routing/tools/convert_c_to_py.c | 159 - .../drivers/ni_routing/tools/convert_csv_to_c.py | 503 -- .../drivers/ni_routing/tools/convert_py_to_csv.py | 67 - .../drivers/ni_routing/tools/csv_collection.py | 40 - .../drivers/ni_routing/tools/make_blank_csv.py | 32 - .../comedi/drivers/ni_routing/tools/ni_names.py | 56 - drivers/staging/comedi/drivers/ni_stc.h | 1142 ---- drivers/staging/comedi/drivers/ni_tio.c | 1842 ------ drivers/staging/comedi/drivers/ni_tio.h | 181 - drivers/staging/comedi/drivers/ni_tio_internal.h | 176 - drivers/staging/comedi/drivers/ni_tiocmd.c | 510 -- drivers/staging/comedi/drivers/ni_usb6501.c | 602 -- drivers/staging/comedi/drivers/pcl711.c | 513 -- drivers/staging/comedi/drivers/pcl724.c | 153 - drivers/staging/comedi/drivers/pcl726.c | 425 -- drivers/staging/comedi/drivers/pcl730.c | 350 -- drivers/staging/comedi/drivers/pcl812.c | 1336 ----- drivers/staging/comedi/drivers/pcl816.c | 696 --- drivers/staging/comedi/drivers/pcl818.c | 1137 ---- drivers/staging/comedi/drivers/pcm3724.c | 227 - drivers/staging/comedi/drivers/pcmad.c | 149 - drivers/staging/comedi/drivers/pcmda12.c | 165 - drivers/staging/comedi/drivers/pcmmio.c | 777 --- drivers/staging/comedi/drivers/pcmuio.c | 624 -- drivers/staging/comedi/drivers/plx9052.h | 70 - drivers/staging/comedi/drivers/plx9080.h | 656 -- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 842 --- drivers/staging/comedi/drivers/rtd520.c | 1365 ----- drivers/staging/comedi/drivers/rti800.c | 357 -- drivers/staging/comedi/drivers/rti802.c | 120 - drivers/staging/comedi/drivers/s526.c | 629 -- drivers/staging/comedi/drivers/s626.c | 2605 -------- drivers/staging/comedi/drivers/s626.h | 869 --- drivers/staging/comedi/drivers/ssv_dnp.c | 180 - drivers/staging/comedi/drivers/tests/Makefile | 8 - .../comedi/drivers/tests/comedi_example_test.c | 72 - .../staging/comedi/drivers/tests/ni_routes_test.c | 611 -- drivers/staging/comedi/drivers/tests/unittest.h | 63 - drivers/staging/comedi/drivers/usbdux.c | 1729 ------ drivers/staging/comedi/drivers/usbduxfast.c | 1039 ---- drivers/staging/comedi/drivers/usbduxsigma.c | 1616 ----- drivers/staging/comedi/drivers/vmk80xx.c | 880 --- drivers/staging/comedi/drivers/z8536.h | 210 - drivers/staging/comedi/kcomedilib/Makefile | 6 - .../staging/comedi/kcomedilib/kcomedilib_main.c | 255 - drivers/staging/comedi/proc.c | 74 - drivers/staging/comedi/range.c | 131 - 434 files changed, 132821 insertions(+), 132821 deletions(-) create mode 100644 drivers/comedi/Kconfig create mode 100644 drivers/comedi/Makefile create mode 100644 drivers/comedi/TODO create mode 100644 drivers/comedi/comedi.h create mode 100644 drivers/comedi/comedi_buf.c create mode 100644 drivers/comedi/comedi_fops.c create mode 100644 drivers/comedi/comedi_internal.h create mode 100644 drivers/comedi/comedi_pci.c create mode 100644 drivers/comedi/comedi_pci.h create mode 100644 drivers/comedi/comedi_pcmcia.c create mode 100644 drivers/comedi/comedi_pcmcia.h create mode 100644 drivers/comedi/comedi_usb.c create mode 100644 drivers/comedi/comedi_usb.h create mode 100644 drivers/comedi/comedidev.h create mode 100644 drivers/comedi/comedilib.h create mode 100644 drivers/comedi/drivers.c create mode 100644 drivers/comedi/drivers/8255.c create mode 100644 drivers/comedi/drivers/8255.h create mode 100644 drivers/comedi/drivers/8255_pci.c create mode 100644 drivers/comedi/drivers/Makefile create mode 100644 drivers/comedi/drivers/addi_apci_1032.c create mode 100644 drivers/comedi/drivers/addi_apci_1500.c create mode 100644 drivers/comedi/drivers/addi_apci_1516.c create mode 100644 drivers/comedi/drivers/addi_apci_1564.c create mode 100644 drivers/comedi/drivers/addi_apci_16xx.c create mode 100644 drivers/comedi/drivers/addi_apci_2032.c create mode 100644 drivers/comedi/drivers/addi_apci_2200.c create mode 100644 drivers/comedi/drivers/addi_apci_3120.c create mode 100644 drivers/comedi/drivers/addi_apci_3501.c create mode 100644 drivers/comedi/drivers/addi_apci_3xxx.c create mode 100644 drivers/comedi/drivers/addi_tcw.h create mode 100644 drivers/comedi/drivers/addi_watchdog.c create mode 100644 drivers/comedi/drivers/addi_watchdog.h create mode 100644 drivers/comedi/drivers/adl_pci6208.c create mode 100644 drivers/comedi/drivers/adl_pci7x3x.c create mode 100644 drivers/comedi/drivers/adl_pci8164.c create mode 100644 drivers/comedi/drivers/adl_pci9111.c create mode 100644 drivers/comedi/drivers/adl_pci9118.c create mode 100644 drivers/comedi/drivers/adq12b.c create mode 100644 drivers/comedi/drivers/adv_pci1710.c create mode 100644 drivers/comedi/drivers/adv_pci1720.c create mode 100644 drivers/comedi/drivers/adv_pci1723.c create mode 100644 drivers/comedi/drivers/adv_pci1724.c create mode 100644 drivers/comedi/drivers/adv_pci1760.c create mode 100644 drivers/comedi/drivers/adv_pci_dio.c create mode 100644 drivers/comedi/drivers/aio_aio12_8.c create mode 100644 drivers/comedi/drivers/aio_iiro_16.c create mode 100644 drivers/comedi/drivers/amcc_s5933.h create mode 100644 drivers/comedi/drivers/amplc_dio200.c create mode 100644 drivers/comedi/drivers/amplc_dio200.h create mode 100644 drivers/comedi/drivers/amplc_dio200_common.c create mode 100644 drivers/comedi/drivers/amplc_dio200_pci.c create mode 100644 drivers/comedi/drivers/amplc_pc236.c create mode 100644 drivers/comedi/drivers/amplc_pc236.h create mode 100644 drivers/comedi/drivers/amplc_pc236_common.c create mode 100644 drivers/comedi/drivers/amplc_pc263.c create mode 100644 drivers/comedi/drivers/amplc_pci224.c create mode 100644 drivers/comedi/drivers/amplc_pci230.c create mode 100644 drivers/comedi/drivers/amplc_pci236.c create mode 100644 drivers/comedi/drivers/amplc_pci263.c create mode 100644 drivers/comedi/drivers/c6xdigio.c create mode 100644 drivers/comedi/drivers/cb_das16_cs.c create mode 100644 drivers/comedi/drivers/cb_pcidas.c create mode 100644 drivers/comedi/drivers/cb_pcidas64.c create mode 100644 drivers/comedi/drivers/cb_pcidda.c create mode 100644 drivers/comedi/drivers/cb_pcimdas.c create mode 100644 drivers/comedi/drivers/cb_pcimdda.c create mode 100644 drivers/comedi/drivers/comedi_8254.c create mode 100644 drivers/comedi/drivers/comedi_8254.h create mode 100644 drivers/comedi/drivers/comedi_8255.c create mode 100644 drivers/comedi/drivers/comedi_bond.c create mode 100644 drivers/comedi/drivers/comedi_isadma.c create mode 100644 drivers/comedi/drivers/comedi_isadma.h create mode 100644 drivers/comedi/drivers/comedi_parport.c create mode 100644 drivers/comedi/drivers/comedi_test.c create mode 100644 drivers/comedi/drivers/contec_pci_dio.c create mode 100644 drivers/comedi/drivers/dac02.c create mode 100644 drivers/comedi/drivers/daqboard2000.c create mode 100644 drivers/comedi/drivers/das08.c create mode 100644 drivers/comedi/drivers/das08.h create mode 100644 drivers/comedi/drivers/das08_cs.c create mode 100644 drivers/comedi/drivers/das08_isa.c create mode 100644 drivers/comedi/drivers/das08_pci.c create mode 100644 drivers/comedi/drivers/das16.c create mode 100644 drivers/comedi/drivers/das16m1.c create mode 100644 drivers/comedi/drivers/das1800.c create mode 100644 drivers/comedi/drivers/das6402.c create mode 100644 drivers/comedi/drivers/das800.c create mode 100644 drivers/comedi/drivers/dmm32at.c create mode 100644 drivers/comedi/drivers/dt2801.c create mode 100644 drivers/comedi/drivers/dt2811.c create mode 100644 drivers/comedi/drivers/dt2814.c create mode 100644 drivers/comedi/drivers/dt2815.c create mode 100644 drivers/comedi/drivers/dt2817.c create mode 100644 drivers/comedi/drivers/dt282x.c create mode 100644 drivers/comedi/drivers/dt3000.c create mode 100644 drivers/comedi/drivers/dt9812.c create mode 100644 drivers/comedi/drivers/dyna_pci10xx.c create mode 100644 drivers/comedi/drivers/fl512.c create mode 100644 drivers/comedi/drivers/gsc_hpdi.c create mode 100644 drivers/comedi/drivers/icp_multi.c create mode 100644 drivers/comedi/drivers/ii_pci20kc.c create mode 100644 drivers/comedi/drivers/jr3_pci.c create mode 100644 drivers/comedi/drivers/jr3_pci.h create mode 100644 drivers/comedi/drivers/ke_counter.c create mode 100644 drivers/comedi/drivers/me4000.c create mode 100644 drivers/comedi/drivers/me_daq.c create mode 100644 drivers/comedi/drivers/mf6x4.c create mode 100644 drivers/comedi/drivers/mite.c create mode 100644 drivers/comedi/drivers/mite.h create mode 100644 drivers/comedi/drivers/mpc624.c create mode 100644 drivers/comedi/drivers/multiq3.c create mode 100644 drivers/comedi/drivers/ni_6527.c create mode 100644 drivers/comedi/drivers/ni_65xx.c create mode 100644 drivers/comedi/drivers/ni_660x.c create mode 100644 drivers/comedi/drivers/ni_670x.c create mode 100644 drivers/comedi/drivers/ni_at_a2150.c create mode 100644 drivers/comedi/drivers/ni_at_ao.c create mode 100644 drivers/comedi/drivers/ni_atmio.c create mode 100644 drivers/comedi/drivers/ni_atmio16d.c create mode 100644 drivers/comedi/drivers/ni_daq_700.c create mode 100644 drivers/comedi/drivers/ni_daq_dio24.c create mode 100644 drivers/comedi/drivers/ni_labpc.c create mode 100644 drivers/comedi/drivers/ni_labpc.h create mode 100644 drivers/comedi/drivers/ni_labpc_common.c create mode 100644 drivers/comedi/drivers/ni_labpc_cs.c create mode 100644 drivers/comedi/drivers/ni_labpc_isadma.c create mode 100644 drivers/comedi/drivers/ni_labpc_isadma.h create mode 100644 drivers/comedi/drivers/ni_labpc_pci.c create mode 100644 drivers/comedi/drivers/ni_labpc_regs.h create mode 100644 drivers/comedi/drivers/ni_mio_common.c create mode 100644 drivers/comedi/drivers/ni_mio_cs.c create mode 100644 drivers/comedi/drivers/ni_pcidio.c create mode 100644 drivers/comedi/drivers/ni_pcimio.c create mode 100644 drivers/comedi/drivers/ni_routes.c create mode 100644 drivers/comedi/drivers/ni_routes.h create mode 100644 drivers/comedi/drivers/ni_routing/README create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes.h create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/all.h create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6070e.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6220.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6221.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6229.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6251.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6254.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6259.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6534.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6602.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6713.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6723.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pci-6733.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6030e.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6224.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6225.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6251.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pxi-6733.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6251.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6535.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_device_routes/pxie-6738.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_route_values.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_route_values.h create mode 100644 drivers/comedi/drivers/ni_routing/ni_route_values/all.h create mode 100644 drivers/comedi/drivers/ni_routing/ni_route_values/ni_660x.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_route_values/ni_eseries.c create mode 100644 drivers/comedi/drivers/ni_routing/ni_route_values/ni_mseries.c create mode 100644 drivers/comedi/drivers/ni_routing/tools/.gitignore create mode 100644 drivers/comedi/drivers/ni_routing/tools/Makefile create mode 100644 drivers/comedi/drivers/ni_routing/tools/convert_c_to_py.c create mode 100755 drivers/comedi/drivers/ni_routing/tools/convert_csv_to_c.py create mode 100755 drivers/comedi/drivers/ni_routing/tools/convert_py_to_csv.py create mode 100644 drivers/comedi/drivers/ni_routing/tools/csv_collection.py create mode 100755 drivers/comedi/drivers/ni_routing/tools/make_blank_csv.py create mode 100644 drivers/comedi/drivers/ni_routing/tools/ni_names.py create mode 100644 drivers/comedi/drivers/ni_stc.h create mode 100644 drivers/comedi/drivers/ni_tio.c create mode 100644 drivers/comedi/drivers/ni_tio.h create mode 100644 drivers/comedi/drivers/ni_tio_internal.h create mode 100644 drivers/comedi/drivers/ni_tiocmd.c create mode 100644 drivers/comedi/drivers/ni_usb6501.c create mode 100644 drivers/comedi/drivers/pcl711.c create mode 100644 drivers/comedi/drivers/pcl724.c create mode 100644 drivers/comedi/drivers/pcl726.c create mode 100644 drivers/comedi/drivers/pcl730.c create mode 100644 drivers/comedi/drivers/pcl812.c create mode 100644 drivers/comedi/drivers/pcl816.c create mode 100644 drivers/comedi/drivers/pcl818.c create mode 100644 drivers/comedi/drivers/pcm3724.c create mode 100644 drivers/comedi/drivers/pcmad.c create mode 100644 drivers/comedi/drivers/pcmda12.c create mode 100644 drivers/comedi/drivers/pcmmio.c create mode 100644 drivers/comedi/drivers/pcmuio.c create mode 100644 drivers/comedi/drivers/plx9052.h create mode 100644 drivers/comedi/drivers/plx9080.h create mode 100644 drivers/comedi/drivers/quatech_daqp_cs.c create mode 100644 drivers/comedi/drivers/rtd520.c create mode 100644 drivers/comedi/drivers/rti800.c create mode 100644 drivers/comedi/drivers/rti802.c create mode 100644 drivers/comedi/drivers/s526.c create mode 100644 drivers/comedi/drivers/s626.c create mode 100644 drivers/comedi/drivers/s626.h create mode 100644 drivers/comedi/drivers/ssv_dnp.c create mode 100644 drivers/comedi/drivers/tests/Makefile create mode 100644 drivers/comedi/drivers/tests/comedi_example_test.c create mode 100644 drivers/comedi/drivers/tests/ni_routes_test.c create mode 100644 drivers/comedi/drivers/tests/unittest.h create mode 100644 drivers/comedi/drivers/usbdux.c create mode 100644 drivers/comedi/drivers/usbduxfast.c create mode 100644 drivers/comedi/drivers/usbduxsigma.c create mode 100644 drivers/comedi/drivers/vmk80xx.c create mode 100644 drivers/comedi/drivers/z8536.h create mode 100644 drivers/comedi/kcomedilib/Makefile create mode 100644 drivers/comedi/kcomedilib/kcomedilib_main.c create mode 100644 drivers/comedi/proc.c create mode 100644 drivers/comedi/range.c delete mode 100644 drivers/staging/comedi/Kconfig delete mode 100644 drivers/staging/comedi/Makefile delete mode 100644 drivers/staging/comedi/TODO delete mode 100644 drivers/staging/comedi/comedi.h delete mode 100644 drivers/staging/comedi/comedi_buf.c delete mode 100644 drivers/staging/comedi/comedi_fops.c delete mode 100644 drivers/staging/comedi/comedi_internal.h delete mode 100644 drivers/staging/comedi/comedi_pci.c delete mode 100644 drivers/staging/comedi/comedi_pci.h delete mode 100644 drivers/staging/comedi/comedi_pcmcia.c delete mode 100644 drivers/staging/comedi/comedi_pcmcia.h delete mode 100644 drivers/staging/comedi/comedi_usb.c delete mode 100644 drivers/staging/comedi/comedi_usb.h delete mode 100644 drivers/staging/comedi/comedidev.h delete mode 100644 drivers/staging/comedi/comedilib.h delete mode 100644 drivers/staging/comedi/drivers.c delete mode 100644 drivers/staging/comedi/drivers/8255.c delete mode 100644 drivers/staging/comedi/drivers/8255.h delete mode 100644 drivers/staging/comedi/drivers/8255_pci.c delete mode 100644 drivers/staging/comedi/drivers/Makefile delete mode 100644 drivers/staging/comedi/drivers/addi_apci_1032.c delete mode 100644 drivers/staging/comedi/drivers/addi_apci_1500.c delete mode 100644 drivers/staging/comedi/drivers/addi_apci_1516.c delete mode 100644 drivers/staging/comedi/drivers/addi_apci_1564.c delete mode 100644 drivers/staging/comedi/drivers/addi_apci_16xx.c delete mode 100644 drivers/staging/comedi/drivers/addi_apci_2032.c delete mode 100644 drivers/staging/comedi/drivers/addi_apci_2200.c delete mode 100644 drivers/staging/comedi/drivers/addi_apci_3120.c delete mode 100644 drivers/staging/comedi/drivers/addi_apci_3501.c delete mode 100644 drivers/staging/comedi/drivers/addi_apci_3xxx.c delete mode 100644 drivers/staging/comedi/drivers/addi_tcw.h delete mode 100644 drivers/staging/comedi/drivers/addi_watchdog.c delete mode 100644 drivers/staging/comedi/drivers/addi_watchdog.h delete mode 100644 drivers/staging/comedi/drivers/adl_pci6208.c delete mode 100644 drivers/staging/comedi/drivers/adl_pci7x3x.c delete mode 100644 drivers/staging/comedi/drivers/adl_pci8164.c delete mode 100644 drivers/staging/comedi/drivers/adl_pci9111.c delete mode 100644 drivers/staging/comedi/drivers/adl_pci9118.c delete mode 100644 drivers/staging/comedi/drivers/adq12b.c delete mode 100644 drivers/staging/comedi/drivers/adv_pci1710.c delete mode 100644 drivers/staging/comedi/drivers/adv_pci1720.c delete mode 100644 drivers/staging/comedi/drivers/adv_pci1723.c delete mode 100644 drivers/staging/comedi/drivers/adv_pci1724.c delete mode 100644 drivers/staging/comedi/drivers/adv_pci1760.c delete mode 100644 drivers/staging/comedi/drivers/adv_pci_dio.c delete mode 100644 drivers/staging/comedi/drivers/aio_aio12_8.c delete mode 100644 drivers/staging/comedi/drivers/aio_iiro_16.c delete mode 100644 drivers/staging/comedi/drivers/amcc_s5933.h delete mode 100644 drivers/staging/comedi/drivers/amplc_dio200.c delete mode 100644 drivers/staging/comedi/drivers/amplc_dio200.h delete mode 100644 drivers/staging/comedi/drivers/amplc_dio200_common.c delete mode 100644 drivers/staging/comedi/drivers/amplc_dio200_pci.c delete mode 100644 drivers/staging/comedi/drivers/amplc_pc236.c delete mode 100644 drivers/staging/comedi/drivers/amplc_pc236.h delete mode 100644 drivers/staging/comedi/drivers/amplc_pc236_common.c delete mode 100644 drivers/staging/comedi/drivers/amplc_pc263.c delete mode 100644 drivers/staging/comedi/drivers/amplc_pci224.c delete mode 100644 drivers/staging/comedi/drivers/amplc_pci230.c delete mode 100644 drivers/staging/comedi/drivers/amplc_pci236.c delete mode 100644 drivers/staging/comedi/drivers/amplc_pci263.c delete mode 100644 drivers/staging/comedi/drivers/c6xdigio.c delete mode 100644 drivers/staging/comedi/drivers/cb_das16_cs.c delete mode 100644 drivers/staging/comedi/drivers/cb_pcidas.c delete mode 100644 drivers/staging/comedi/drivers/cb_pcidas64.c delete mode 100644 drivers/staging/comedi/drivers/cb_pcidda.c delete mode 100644 drivers/staging/comedi/drivers/cb_pcimdas.c delete mode 100644 drivers/staging/comedi/drivers/cb_pcimdda.c delete mode 100644 drivers/staging/comedi/drivers/comedi_8254.c delete mode 100644 drivers/staging/comedi/drivers/comedi_8254.h delete mode 100644 drivers/staging/comedi/drivers/comedi_8255.c delete mode 100644 drivers/staging/comedi/drivers/comedi_bond.c delete mode 100644 drivers/staging/comedi/drivers/comedi_isadma.c delete mode 100644 drivers/staging/comedi/drivers/comedi_isadma.h delete mode 100644 drivers/staging/comedi/drivers/comedi_parport.c delete mode 100644 drivers/staging/comedi/drivers/comedi_test.c delete mode 100644 drivers/staging/comedi/drivers/contec_pci_dio.c delete mode 100644 drivers/staging/comedi/drivers/dac02.c delete mode 100644 drivers/staging/comedi/drivers/daqboard2000.c delete mode 100644 drivers/staging/comedi/drivers/das08.c delete mode 100644 drivers/staging/comedi/drivers/das08.h delete mode 100644 drivers/staging/comedi/drivers/das08_cs.c delete mode 100644 drivers/staging/comedi/drivers/das08_isa.c delete mode 100644 drivers/staging/comedi/drivers/das08_pci.c delete mode 100644 drivers/staging/comedi/drivers/das16.c delete mode 100644 drivers/staging/comedi/drivers/das16m1.c delete mode 100644 drivers/staging/comedi/drivers/das1800.c delete mode 100644 drivers/staging/comedi/drivers/das6402.c delete mode 100644 drivers/staging/comedi/drivers/das800.c delete mode 100644 drivers/staging/comedi/drivers/dmm32at.c delete mode 100644 drivers/staging/comedi/drivers/dt2801.c delete mode 100644 drivers/staging/comedi/drivers/dt2811.c delete mode 100644 drivers/staging/comedi/drivers/dt2814.c delete mode 100644 drivers/staging/comedi/drivers/dt2815.c delete mode 100644 drivers/staging/comedi/drivers/dt2817.c delete mode 100644 drivers/staging/comedi/drivers/dt282x.c delete mode 100644 drivers/staging/comedi/drivers/dt3000.c delete mode 100644 drivers/staging/comedi/drivers/dt9812.c delete mode 100644 drivers/staging/comedi/drivers/dyna_pci10xx.c delete mode 100644 drivers/staging/comedi/drivers/fl512.c delete mode 100644 drivers/staging/comedi/drivers/gsc_hpdi.c delete mode 100644 drivers/staging/comedi/drivers/icp_multi.c delete mode 100644 drivers/staging/comedi/drivers/ii_pci20kc.c delete mode 100644 drivers/staging/comedi/drivers/jr3_pci.c delete mode 100644 drivers/staging/comedi/drivers/jr3_pci.h delete mode 100644 drivers/staging/comedi/drivers/ke_counter.c delete mode 100644 drivers/staging/comedi/drivers/me4000.c delete mode 100644 drivers/staging/comedi/drivers/me_daq.c delete mode 100644 drivers/staging/comedi/drivers/mf6x4.c delete mode 100644 drivers/staging/comedi/drivers/mite.c delete mode 100644 drivers/staging/comedi/drivers/mite.h delete mode 100644 drivers/staging/comedi/drivers/mpc624.c delete mode 100644 drivers/staging/comedi/drivers/multiq3.c delete mode 100644 drivers/staging/comedi/drivers/ni_6527.c delete mode 100644 drivers/staging/comedi/drivers/ni_65xx.c delete mode 100644 drivers/staging/comedi/drivers/ni_660x.c delete mode 100644 drivers/staging/comedi/drivers/ni_670x.c delete mode 100644 drivers/staging/comedi/drivers/ni_at_a2150.c delete mode 100644 drivers/staging/comedi/drivers/ni_at_ao.c delete mode 100644 drivers/staging/comedi/drivers/ni_atmio.c delete mode 100644 drivers/staging/comedi/drivers/ni_atmio16d.c delete mode 100644 drivers/staging/comedi/drivers/ni_daq_700.c delete mode 100644 drivers/staging/comedi/drivers/ni_daq_dio24.c delete mode 100644 drivers/staging/comedi/drivers/ni_labpc.c delete mode 100644 drivers/staging/comedi/drivers/ni_labpc.h delete mode 100644 drivers/staging/comedi/drivers/ni_labpc_common.c delete mode 100644 drivers/staging/comedi/drivers/ni_labpc_cs.c delete mode 100644 drivers/staging/comedi/drivers/ni_labpc_isadma.c delete mode 100644 drivers/staging/comedi/drivers/ni_labpc_isadma.h delete mode 100644 drivers/staging/comedi/drivers/ni_labpc_pci.c delete mode 100644 drivers/staging/comedi/drivers/ni_labpc_regs.h delete mode 100644 drivers/staging/comedi/drivers/ni_mio_common.c delete mode 100644 drivers/staging/comedi/drivers/ni_mio_cs.c delete mode 100644 drivers/staging/comedi/drivers/ni_pcidio.c delete mode 100644 drivers/staging/comedi/drivers/ni_pcimio.c delete mode 100644 drivers/staging/comedi/drivers/ni_routes.c delete mode 100644 drivers/staging/comedi/drivers/ni_routes.h delete mode 100644 drivers/staging/comedi/drivers/ni_routing/README delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes.h delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/all.h delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6070e.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6220.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6221.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6229.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6251.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6254.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6259.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6534.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6602.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6713.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6723.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pci-6733.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6030e.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6224.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6225.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6251.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxi-6733.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxie-6251.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxie-6535.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_device_routes/pxie-6738.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_route_values.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_route_values.h delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_route_values/all.h delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_route_values/ni_660x.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_route_values/ni_eseries.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/ni_route_values/ni_mseries.c delete mode 100644 drivers/staging/comedi/drivers/ni_routing/tools/.gitignore delete mode 100644 drivers/staging/comedi/drivers/ni_routing/tools/Makefile delete mode 100644 drivers/staging/comedi/drivers/ni_routing/tools/convert_c_to_py.c delete mode 100755 drivers/staging/comedi/drivers/ni_routing/tools/convert_csv_to_c.py delete mode 100755 drivers/staging/comedi/drivers/ni_routing/tools/convert_py_to_csv.py delete mode 100644 drivers/staging/comedi/drivers/ni_routing/tools/csv_collection.py delete mode 100755 drivers/staging/comedi/drivers/ni_routing/tools/make_blank_csv.py delete mode 100644 drivers/staging/comedi/drivers/ni_routing/tools/ni_names.py delete mode 100644 drivers/staging/comedi/drivers/ni_stc.h delete mode 100644 drivers/staging/comedi/drivers/ni_tio.c delete mode 100644 drivers/staging/comedi/drivers/ni_tio.h delete mode 100644 drivers/staging/comedi/drivers/ni_tio_internal.h delete mode 100644 drivers/staging/comedi/drivers/ni_tiocmd.c delete mode 100644 drivers/staging/comedi/drivers/ni_usb6501.c delete mode 100644 drivers/staging/comedi/drivers/pcl711.c delete mode 100644 drivers/staging/comedi/drivers/pcl724.c delete mode 100644 drivers/staging/comedi/drivers/pcl726.c delete mode 100644 drivers/staging/comedi/drivers/pcl730.c delete mode 100644 drivers/staging/comedi/drivers/pcl812.c delete mode 100644 drivers/staging/comedi/drivers/pcl816.c delete mode 100644 drivers/staging/comedi/drivers/pcl818.c delete mode 100644 drivers/staging/comedi/drivers/pcm3724.c delete mode 100644 drivers/staging/comedi/drivers/pcmad.c delete mode 100644 drivers/staging/comedi/drivers/pcmda12.c delete mode 100644 drivers/staging/comedi/drivers/pcmmio.c delete mode 100644 drivers/staging/comedi/drivers/pcmuio.c delete mode 100644 drivers/staging/comedi/drivers/plx9052.h delete mode 100644 drivers/staging/comedi/drivers/plx9080.h delete mode 100644 drivers/staging/comedi/drivers/quatech_daqp_cs.c delete mode 100644 drivers/staging/comedi/drivers/rtd520.c delete mode 100644 drivers/staging/comedi/drivers/rti800.c delete mode 100644 drivers/staging/comedi/drivers/rti802.c delete mode 100644 drivers/staging/comedi/drivers/s526.c delete mode 100644 drivers/staging/comedi/drivers/s626.c delete mode 100644 drivers/staging/comedi/drivers/s626.h delete mode 100644 drivers/staging/comedi/drivers/ssv_dnp.c delete mode 100644 drivers/staging/comedi/drivers/tests/Makefile delete mode 100644 drivers/staging/comedi/drivers/tests/comedi_example_test.c delete mode 100644 drivers/staging/comedi/drivers/tests/ni_routes_test.c delete mode 100644 drivers/staging/comedi/drivers/tests/unittest.h delete mode 100644 drivers/staging/comedi/drivers/usbdux.c delete mode 100644 drivers/staging/comedi/drivers/usbduxfast.c delete mode 100644 drivers/staging/comedi/drivers/usbduxsigma.c delete mode 100644 drivers/staging/comedi/drivers/vmk80xx.c delete mode 100644 drivers/staging/comedi/drivers/z8536.h delete mode 100644 drivers/staging/comedi/kcomedilib/Makefile delete mode 100644 drivers/staging/comedi/kcomedilib/kcomedilib_main.c delete mode 100644 drivers/staging/comedi/proc.c delete mode 100644 drivers/staging/comedi/range.c (limited to 'drivers') diff --git a/drivers/Kconfig b/drivers/Kconfig index 62c753a73651..47980c6b1945 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -149,6 +149,8 @@ source "drivers/xen/Kconfig" source "drivers/greybus/Kconfig" +source "drivers/comedi/Kconfig" + source "drivers/staging/Kconfig" source "drivers/platform/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index 6fba7daba591..8f3fee8281ad 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -148,6 +148,7 @@ obj-$(CONFIG_VHOST_IOTLB) += vhost/ obj-$(CONFIG_VHOST) += vhost/ obj-$(CONFIG_VLYNQ) += vlynq/ obj-$(CONFIG_GREYBUS) += greybus/ +obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_STAGING) += staging/ obj-y += platform/ diff --git a/drivers/comedi/Kconfig b/drivers/comedi/Kconfig new file mode 100644 index 000000000000..3cb61fa2c5c3 --- /dev/null +++ b/drivers/comedi/Kconfig @@ -0,0 +1,1355 @@ +# SPDX-License-Identifier: GPL-2.0 +config COMEDI + tristate "Data acquisition support (comedi)" + help + Enable support for a wide range of data acquisition devices + for Linux. + +if COMEDI + +config COMEDI_DEBUG + bool "Comedi debugging" + help + This is an option for use by developers; most people should + say N here. This enables comedi core and driver debugging. + +config COMEDI_DEFAULT_BUF_SIZE_KB + int "Comedi default initial asynchronous buffer size in KiB" + default "2048" + help + This is the default asynchronous buffer size which is used for + commands running in the background in kernel space. This + defaults to 2048 KiB of memory so that a 16 channel card + running at 10 kHz has of 2-4 seconds of buffer. + +config COMEDI_DEFAULT_BUF_MAXSIZE_KB + int "Comedi default maximum asynchronous buffer size in KiB" + default "20480" + help + This is the default maximum asynchronous buffer size which can + be requested by a userspace program without root privileges. + This is set to 20480 KiB so that a fast I/O card with 16 + channels running at 100 kHz has 2-4 seconds of buffer. + +menuconfig COMEDI_MISC_DRIVERS + bool "Comedi misc drivers" + help + Enable comedi misc drivers to be built + + Note that the answer to this question won't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about misc non-hardware comedi drivers. + +if COMEDI_MISC_DRIVERS + +config COMEDI_BOND + tristate "Comedi device bonding support" + select COMEDI_KCOMEDILIB + help + Enable support for a driver to 'bond' (merge) multiple subdevices + from multiple devices together as one. + + Currently, it only handles digital I/O subdevices. + + To compile this driver as a module, choose M here: the module will be + called comedi_bond. + +config COMEDI_TEST + tristate "Fake waveform generator support" + help + Enable support for the fake waveform generator. + This driver is mainly for testing purposes, but can also be used to + generate sample waveforms on systems that don't have data acquisition + hardware. + + To compile this driver as a module, choose M here: the module will be + called comedi_test. + +config COMEDI_PARPORT + tristate "Parallel port support" + help + Enable support for the standard parallel port. + A cheap and easy way to get a few more digital I/O lines. Steal + additional parallel ports from old computers or your neighbors' + computers. + + To compile this driver as a module, choose M here: the module will be + called comedi_parport. + +config COMEDI_SSV_DNP + tristate "SSV Embedded Systems DIL/Net-PC support" + depends on X86_32 || COMPILE_TEST + help + Enable support for SSV Embedded Systems DIL/Net-PC + + To compile this driver as a module, choose M here: the module will be + called ssv_dnp. + +endif # COMEDI_MISC_DRIVERS + +menuconfig COMEDI_ISA_DRIVERS + bool "Comedi ISA and PC/104 drivers" + help + Enable comedi ISA and PC/104 drivers to be built + + Note that the answer to this question won't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about ISA and PC/104 comedi drivers. + +if COMEDI_ISA_DRIVERS + +config COMEDI_PCL711 + tristate "Advantech PCL-711/711b and ADlink ACL-8112 ISA card support" + select COMEDI_8254 + help + Enable support for Advantech PCL-711 and 711b, ADlink ACL-8112 + + To compile this driver as a module, choose M here: the module will be + called pcl711. + +config COMEDI_PCL724 + tristate "Advantech PCL-722/724/731 and ADlink ACL-7122/7124/PET-48DIO" + select COMEDI_8255 + help + Enable support for ISA and PC/104 based 8255 digital i/o boards. This + driver provides a legacy comedi driver wrapper for the generic 8255 + support driver. + + Supported boards include: + Advantech PCL-724 24 channels + Advantech PCL-722 144 (or 96) channels + Advantech PCL-731 48 channels + ADlink ACL-7122 144 (or 96) channels + ADlink ACL-7124 24 channels + ADlink PET-48DIO 48 channels + WinSystems PCM-IO48 48 channels (PC/104) + Diamond Systems ONYX-MM-DIO 48 channels (PC/104) + + To compile this driver as a module, choose M here: the module will be + called pcl724. + +config COMEDI_PCL726 + tristate "Advantech PCL-726 and compatible ISA card support" + help + Enable support for Advantech PCL-726 and compatible ISA cards. + + To compile this driver as a module, choose M here: the module will be + called pcl726. + +config COMEDI_PCL730 + tristate "Simple Digital I/O board support (8-bit ports)" + help + Enable support for various simple ISA or PC/104 Digital I/O boards. + These boards all use 8-bit I/O ports. + + Advantech PCL-730 iso - 16 in/16 out ttl - 16 in/16 out + ICP ISO-730 iso - 16 in/16 out ttl - 16 in/16 out + ADlink ACL-7130 iso - 16 in/16 out ttl - 16 in/16 out + Advantech PCM-3730 iso - 8 in/8 out ttl - 16 in/16 out + Advantech PCL-725 iso - 8 in/8 out + ICP P8R8-DIO iso - 8 in/8 out + ADlink ACL-7225b iso - 16 in/16 out + ICP P16R16-DIO iso - 16 in/16 out + Advantech PCL-733 iso - 32 in + Advantech PCL-734 iso - 32 out + Diamond Systems OPMM-1616-XT iso - 16 in/16 out + Diamond Systems PEARL-MM-P iso - 16 out + Diamond Systems IR104-PBF iso - 20 in/20 out + + To compile this driver as a module, choose M here: the module will be + called pcl730. + +config COMEDI_PCL812 + tristate "Advantech PCL-812/813 and ADlink ACL-8112/8113/8113/8216" + select COMEDI_ISADMA if ISA_DMA_API + select COMEDI_8254 + help + Enable support for Advantech PCL-812/PG, PCL-813/B, ADLink + ACL-8112DG/HG/PG, ACL-8113, ACL-8216, ICP DAS A-821PGH/PGL/PGL-NDA, + A-822PGH/PGL, A-823PGH/PGL, A-826PG and ICP DAS ISO-813 ISA cards + + To compile this driver as a module, choose M here: the module will be + called pcl812. + +config COMEDI_PCL816 + tristate "Advantech PCL-814 and PCL-816 ISA card support" + select COMEDI_ISADMA if ISA_DMA_API + select COMEDI_8254 + help + Enable support for Advantech PCL-814 and PCL-816 ISA cards + + To compile this driver as a module, choose M here: the module will be + called pcl816. + +config COMEDI_PCL818 + tristate "Advantech PCL-718 and PCL-818 ISA card support" + select COMEDI_ISADMA if ISA_DMA_API + select COMEDI_8254 + help + Enable support for Advantech PCL-818 ISA cards + PCL-818L, PCL-818H, PCL-818HD, PCL-818HG, PCL-818 and PCL-718 + + To compile this driver as a module, choose M here: the module will be + called pcl818. + +config COMEDI_PCM3724 + tristate "Advantech PCM-3724 PC/104 card support" + select COMEDI_8255 + help + Enable support for Advantech PCM-3724 PC/104 cards. + + To compile this driver as a module, choose M here: the module will be + called pcm3724. + +config COMEDI_AMPLC_DIO200_ISA + tristate "Amplicon PC212E/PC214E/PC215E/PC218E/PC272E" + select COMEDI_AMPLC_DIO200 + help + Enable support for Amplicon PC212E, PC214E, PC215E, PC218E and + PC272E ISA DIO boards + + To compile this driver as a module, choose M here: the module will be + called amplc_dio200. + +config COMEDI_AMPLC_PC236_ISA + tristate "Amplicon PC36AT DIO board support" + select COMEDI_AMPLC_PC236 + help + Enable support for Amplicon PC36AT ISA DIO board. + + To compile this driver as a module, choose M here: the module will be + called amplc_pc236. + +config COMEDI_AMPLC_PC263_ISA + tristate "Amplicon PC263 relay board support" + help + Enable support for Amplicon PC263 ISA relay board. This board has + 16 reed relay output channels. + + To compile this driver as a module, choose M here: the module will be + called amplc_pc263. + +config COMEDI_RTI800 + tristate "Analog Devices RTI-800/815 ISA card support" + help + Enable support for Analog Devices RTI-800/815 ISA cards + + To compile this driver as a module, choose M here: the module will be + called rti800. + +config COMEDI_RTI802 + tristate "Analog Devices RTI-802 ISA card support" + help + Enable support for Analog Devices RTI-802 ISA cards + + To compile this driver as a module, choose M here: the module will be + called rti802. + +config COMEDI_DAC02 + tristate "Keithley Metrabyte DAC02 compatible ISA card support" + help + Enable support for Keithley Metrabyte DAC02 compatible ISA cards. + + To compile this driver as a module, choose M here: the module will be + called dac02. + +config COMEDI_DAS16M1 + tristate "MeasurementComputing CIO-DAS16/M1DAS-16 ISA card support" + select COMEDI_8254 + select COMEDI_8255 + help + Enable support for Measurement Computing CIO-DAS16/M1 ISA cards. + + To compile this driver as a module, choose M here: the module will be + called das16m1. + +config COMEDI_DAS08_ISA + tristate "DAS-08 compatible ISA and PC/104 card support" + select COMEDI_DAS08 + help + Enable support for Keithley Metrabyte/ComputerBoards DAS08 + and compatible ISA and PC/104 cards: + Keithley Metrabyte/ComputerBoards DAS08, DAS08-PGM, DAS08-PGH, + DAS08-PGL, DAS08-AOH, DAS08-AOL, DAS08-AOM, DAS08/JR-AO, + DA