Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337307
b: refs/heads/master
c: ecab2ef
h: refs/heads/master
i:
  337305: 1f8639b
  337303: 492f5ad
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 26, 2012
1 parent 3052187 commit 42491eb
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 63 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: ad25f545e451f20fc798d69bba60c8fb5558810e
refs/heads/master: ecab2effbf4b692e2b4e21a3ec46bac6bbaf5734
124 changes: 62 additions & 62 deletions trunk/drivers/staging/comedi/drivers/dt3000.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ static const struct comedi_lrange range_dt3000_ai_pgl = {
};

struct dt3k_boardtype {

const char *name;
unsigned int device_id;
int adchan;
Expand All @@ -103,67 +102,68 @@ struct dt3k_boardtype {
};

static const struct dt3k_boardtype dt3k_boardtypes[] = {
{.name = "dt3001",
.device_id = PCI_DEVICE_ID_DT3001,
.adchan = 16,
.adbits = 12,
.adrange = &range_dt3000_ai,
.ai_speed = 3000,
.dachan = 2,
.dabits = 12,
},
{.name = "dt3001-pgl",
.device_id = PCI_DEVICE_ID_DT3001_PGL,
.adchan = 16,
.adbits = 12,
.adrange = &range_dt3000_ai_pgl,
.ai_speed = 3000,
.dachan = 2,
.dabits = 12,
},
{.name = "dt3002",
.device_id = PCI_DEVICE_ID_DT3002,
.adchan = 32,
.adbits = 12,
.adrange = &range_dt3000_ai,
.ai_speed = 3000,
},
{.name = "dt3003",
.device_id = PCI_DEVICE_ID_DT3003,
.adchan = 64,
.adbits = 12,
.adrange = &range_dt3000_ai,
.ai_speed = 3000,
.dachan = 2,
.dabits = 12,
},
{.name = "dt3003-pgl",
.device_id = PCI_DEVICE_ID_DT3003_PGL,
.adchan = 64,
.adbits = 12,
.adrange = &range_dt3000_ai_pgl,
.ai_speed = 3000,
.dachan = 2,
.dabits = 12,
},
{.name = "dt3004",
.device_id = PCI_DEVICE_ID_DT3004,
.adchan = 16,
.adbits = 16,
.adrange = &range_dt3000_ai,
.ai_speed = 10000,
.dachan = 2,
.dabits = 12,
},
{.name = "dt3005", /* a.k.a. 3004-200 */
.device_id = PCI_DEVICE_ID_DT3005,
.adchan = 16,
.adbits = 16,
.adrange = &range_dt3000_ai,
.ai_speed = 5000,
.dachan = 2,
.dabits = 12,
},
{
.name = "dt3001",
.device_id = PCI_DEVICE_ID_DT3001,
.adchan = 16,
.adbits = 12,
.adrange = &range_dt3000_ai,
.ai_speed = 3000,
.dachan = 2,
.dabits = 12,
}, {
.name = "dt3001-pgl",
.device_id = PCI_DEVICE_ID_DT3001_PGL,
.adchan = 16,
.adbits = 12,
.adrange = &range_dt3000_ai_pgl,
.ai_speed = 3000,
.dachan = 2,
.dabits = 12,
}, {
.name = "dt3002",
.device_id = PCI_DEVICE_ID_DT3002,
.adchan = 32,
.adbits = 12,
.adrange = &range_dt3000_ai,
.ai_speed = 3000,
}, {
.name = "dt3003",
.device_id = PCI_DEVICE_ID_DT3003,
.adchan = 64,
.adbits = 12,
.adrange = &range_dt3000_ai,
.ai_speed = 3000,
.dachan = 2,
.dabits = 12,
}, {
.name = "dt3003-pgl",
.device_id = PCI_DEVICE_ID_DT3003_PGL,
.adchan = 64,
.adbits = 12,
.adrange = &range_dt3000_ai_pgl,
.ai_speed = 3000,
.dachan = 2,
.dabits = 12,
}, {
.name = "dt3004",
.device_id = PCI_DEVICE_ID_DT3004,
.adchan = 16,
.adbits = 16,
.adrange = &range_dt3000_ai,
.ai_speed = 10000,
.dachan = 2,
.dabits = 12,
}, {
.name = "dt3005", /* a.k.a. 3004-200 */
.device_id = PCI_DEVICE_ID_DT3005,
.adchan = 16,
.adbits = 16,
.adrange = &range_dt3000_ai,
.ai_speed = 5000,
.dachan = 2,
.dabits = 12,
},
};

#define DT3000_SIZE (4*0x1000)
Expand Down

0 comments on commit 42491eb

Please sign in to comment.