Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317633
b: refs/heads/master
c: 17883d6
h: refs/heads/master
i:
  317631: 5dffb75
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 6, 2012
1 parent 5444fdc commit 2fde2ca
Show file tree
Hide file tree
Showing 2 changed files with 115 additions and 122 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 23e3cce3270b5f0d9c094c9bcb34d919713e02eb
refs/heads/master: 17883d63b32390098e42cb1a0739d361e38b528e
235 changes: 114 additions & 121 deletions trunk/drivers/staging/comedi/drivers/cb_pcidas.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,127 +255,120 @@ struct cb_pcidas_board {

static const struct cb_pcidas_board cb_pcidas_boards[] = {
{
.name = "pci-das1602/16",
.device_id = 0x1,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 16,
.ai_speed = 5000,
.ao_nchan = 2,
.has_ao_fifo = 1,
.ao_scan_speed = 10000,
.fifo_size = 512,
.ranges = &cb_pcidas_ranges,
.trimpot = AD8402,
.has_dac08 = 1,
.is_1602 = 1,
},
{
.name = "pci-das1200",
.device_id = 0xF,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.ai_speed = 3200,
.ao_nchan = 2,
.has_ao_fifo = 0,
.fifo_size = 1024,
.ranges = &cb_pcidas_ranges,
.trimpot = AD7376,
.has_dac08 = 0,
.is_1602 = 0,
},
{
.name = "pci-das1602/12",
.device_id = 0x10,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.ai_speed = 3200,
.ao_nchan = 2,
.has_ao_fifo = 1,
.ao_scan_speed = 4000,
.fifo_size = 1024,
.ranges = &cb_pcidas_ranges,
.trimpot = AD7376,
.has_dac08 = 0,
.is_1602 = 1,
},
{
.name = "pci-das1200/jr",
.device_id = 0x19,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.ai_speed = 3200,
.ao_nchan = 0,
.has_ao_fifo = 0,
.fifo_size = 1024,
.ranges = &cb_pcidas_ranges,
.trimpot = AD7376,
.has_dac08 = 0,
.is_1602 = 0,
},
{
.name = "pci-das1602/16/jr",
.device_id = 0x1C,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 16,
.ai_speed = 5000,
.ao_nchan = 0,
.has_ao_fifo = 0,
.fifo_size = 512,
.ranges = &cb_pcidas_ranges,
.trimpot = AD8402,
.has_dac08 = 1,
.is_1602 = 1,
},
{
.name = "pci-das1000",
.device_id = 0x4C,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.ai_speed = 4000,
.ao_nchan = 0,
.has_ao_fifo = 0,
.fifo_size = 1024,
.ranges = &cb_pcidas_ranges,
.trimpot = AD7376,
.has_dac08 = 0,
.is_1602 = 0,
},
{
.name = "pci-das1001",
.device_id = 0x1a,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.ai_speed = 6800,
.ao_nchan = 2,
.has_ao_fifo = 0,
.fifo_size = 1024,
.ranges = &cb_pcidas_alt_ranges,
.trimpot = AD7376,
.has_dac08 = 0,
.is_1602 = 0,
},
{
.name = "pci-das1002",
.device_id = 0x1b,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.ai_speed = 6800,
.ao_nchan = 2,
.has_ao_fifo = 0,
.fifo_size = 1024,
.ranges = &cb_pcidas_ranges,
.trimpot = AD7376,
.has_dac08 = 0,
.is_1602 = 0,
},
.name = "pci-das1602/16",
.device_id = 0x1,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 16,
.ai_speed = 5000,
.ao_nchan = 2,
.has_ao_fifo = 1,
.ao_scan_speed = 10000,
.fifo_size = 512,
.ranges = &cb_pcidas_ranges,
.trimpot = AD8402,
.has_dac08 = 1,
.is_1602 = 1,
}, {
.name = "pci-das1200",
.device_id = 0xF,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.ai_speed = 3200,
.ao_nchan = 2,
.has_ao_fifo = 0,
.fifo_size = 1024,
.ranges = &cb_pcidas_ranges,
.trimpot = AD7376,
.has_dac08 = 0,
.is_1602 = 0,
}, {
.name = "pci-das1602/12",
.device_id = 0x10,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.ai_speed = 3200,
.ao_nchan = 2,
.has_ao_fifo = 1,
.ao_scan_speed = 4000,
.fifo_size = 1024,
.ranges = &cb_pcidas_ranges,
.trimpot = AD7376,
.has_dac08 = 0,
.is_1602 = 1,
}, {
.name = "pci-das1200/jr",
.device_id = 0x19,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.ai_speed = 3200,
.ao_nchan = 0,
.has_ao_fifo = 0,
.fifo_size = 1024,
.ranges = &cb_pcidas_ranges,
.trimpot = AD7376,
.has_dac08 = 0,
.is_1602 = 0,
}, {
.name = "pci-das1602/16/jr",
.device_id = 0x1C,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 16,
.ai_speed = 5000,
.ao_nchan = 0,
.has_ao_fifo = 0,
.fifo_size = 512,
.ranges = &cb_pcidas_ranges,
.trimpot = AD8402,
.has_dac08 = 1,
.is_1602 = 1,
}, {
.name = "pci-das1000",
.device_id = 0x4C,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.ai_speed = 4000,
.ao_nchan = 0,
.has_ao_fifo = 0,
.fifo_size = 1024,
.ranges = &cb_pcidas_ranges,
.trimpot = AD7376,
.has_dac08 = 0,
.is_1602 = 0,
}, {
.name = "pci-das1001",
.device_id = 0x1a,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.ai_speed = 6800,
.ao_nchan = 2,
.has_ao_fifo = 0,
.fifo_size = 1024,
.ranges = &cb_pcidas_alt_ranges,
.trimpot = AD7376,
.has_dac08 = 0,
.is_1602 = 0,
}, {
.name = "pci-das1002",
.device_id = 0x1b,
.ai_se_chans = 16,
.ai_diff_chans = 8,
.ai_bits = 12,
.ai_speed = 6800,
.ao_nchan = 2,
.has_ao_fifo = 0,
.fifo_size = 1024,
.ranges = &cb_pcidas_ranges,
.trimpot = AD7376,
.has_dac08 = 0,
.is_1602 = 0,
},
};

/* this structure is for data unique to this hardware driver. If
Expand Down

0 comments on commit 2fde2ca

Please sign in to comment.