[PATCH 2/2] comedi: move #ifdef 0'd stuff to TODO
me at ehuber.info
me at ehuber.info
Tue Aug 20 23:43:07 UTC 2019
From: Edmund Huber <me at ehuber.info>
---
drivers/staging/comedi/TODO | 1 +
drivers/staging/comedi/drivers/ni_pcimio.c | 48 ----------------------
2 files changed, 1 insertion(+), 48 deletions(-)
diff --git a/drivers/staging/comedi/TODO b/drivers/staging/comedi/TODO
index f733c017f..4fe1028ca 100644
--- a/drivers/staging/comedi/TODO
+++ b/drivers/staging/comedi/TODO
@@ -5,6 +5,7 @@ TODO:
- audit userspace interface
- Fix coverity 1195261
- cleanup the individual comedi drivers as well
+ - maybe add drivers for BOARD_PCI6115, BOARD_PXI6115, BOARD_PXI6731 (see history on ni_pcimio.c)
Please send patches to Greg Kroah-Hartman <greg at kroah.com> and
copy:
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index e2e64e234..aadba7e31 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -481,43 +481,6 @@ static const struct ni_board_struct ni_boards[] = {
.ao_speed = 250,
.caldac = { ad8804, ad8804 },
},
-#if 0
- /* The 6115 boards probably need their own driver */
- [BOARD_PCI6115] = { /* .device_id = 0x2ed0, */
- .name = "pci-6115",
- .n_adchan = 4,
- .ai_maxdata = 0x0fff,
- .ai_fifo_depth = 8192,
- .gainlkup = ai_gain_611x,
- .ai_speed = 100,
- .n_aochan = 2,
- .ao_maxdata = 0xffff,
- .ao_671x = 1,
- .ao_fifo_depth = 2048,
- .ao_speed = 250,
- .reg_611x = 1,
- /* XXX */
- .caldac = { ad8804_debug, ad8804_debug, ad8804_debug },
- },
-#endif
-#if 0
- [BOARD_PXI6115] = { /* .device_id = ????, */
- .name = "pxi-6115",
- .n_adchan = 4,
- .ai_maxdata = 0x0fff,
- .ai_fifo_depth = 8192,
- .gainlkup = ai_gain_611x,
- .ai_speed = 100,
- .n_aochan = 2,
- .ao_maxdata = 0xffff,
- .ao_671x = 1,
- .ao_fifo_depth = 2048,
- .ao_speed = 250,
- .reg_611x = 1,
- /* XXX */
- .caldac = { ad8804_debug, ad8804_debug, ad8804_debug },
- },
-#endif
[BOARD_PCI6711] = {
.name = "pci-6711",
.n_aochan = 4,
@@ -569,17 +532,6 @@ static const struct ni_board_struct ni_boards[] = {
.reg_type = ni_reg_6711,
.caldac = { ad8804_debug },
},
-#if 0
- [BOARD_PXI6731] = { /* .device_id = ????, */
- .name = "pxi-6731",
- .n_aochan = 4,
- .ao_maxdata = 0xffff,
- .ao_fifo_depth = 8192,
- .ao_range_table = &range_bipolar10,
- .reg_type = ni_reg_6711,
- .caldac = { ad8804_debug },
- },
-#endif
[BOARD_PCI6733] = {
.name = "pci-6733",
.n_aochan = 8,
--
2.17.1
More information about the devel
mailing list