From: David Schleef Date: Sat, 5 Aug 2000 23:31:05 +0000 (+0000) Subject: new PCI ids from ni source X-Git-Tag: r0_7_48~28 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e41f9eff2e3dadbbc6727c1ec7075d92da96ec3c;p=comedi.git new PCI ids from ni source --- diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c index 36fa8233..92407638 100644 --- a/comedi/drivers/ni_pcidio.c +++ b/comedi/drivers/ni_pcidio.c @@ -174,11 +174,41 @@ static nidio_board nidio_boards[]={ is_diodaq: 0, }, { - dev_id: 0x17d0, + dev_id: 0x1630, + name: "pci-dio-96b", + n_8255: 4, + is_diodaq: 0, + }, + { + dev_id: 0x13c0, + name: "pxi-6508", + n_8255: 4, + is_diodaq: 0, + }, + { + dev_id: 0x0400, name: "pci-6503", n_8255: 1, is_diodaq: 0, }, + { + dev_id: 0x1250, + name: "pci-6503b", + n_8255: 1, + is_diodaq: 0, + }, + { + dev_id: 0x17d0, + name: "pci-6503x", + n_8255: 1, + is_diodaq: 0, + }, + { + dev_id: 0x1800, + name: "pxi-6503", + n_8255: 1, + is_diodaq: 0, + }, }; #define n_nidio_boards (sizeof(nidio_boards)/sizeof(nidio_boards[0])) diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c index 237ec227..4c1ecec7 100644 --- a/comedi/drivers/ni_pcimio.c +++ b/comedi/drivers/ni_pcimio.c @@ -167,8 +167,7 @@ static ni_board ni_boards[]={ caldac: type2, has_8255: 0, }, -#if 0 - { device_id: 0x0000, /* unknown */ + { device_id: 0x1270, name: "pci-6032e", n_adchan: 16, adbits: 16, @@ -183,9 +182,7 @@ static ni_board ni_boards[]={ caldac: type2, has_8255: 0, }, -#endif -#if 0 - { device_id: 0x0000, /* unknown */ + { device_id: 0x1340, name: "pci-6033e", n_adchan: 64, adbits: 16, @@ -200,7 +197,6 @@ static ni_board ni_boards[]={ caldac: type2, has_8255: 0, }, -#endif { device_id: 0x1350, name: "pci-6071e", n_adchan: 64, @@ -245,7 +241,7 @@ static ni_board ni_boards[]={ caldac: type3, has_8255: 0, }, - { device_id: 0x2a80, /* unknown */ + { device_id: 0x2a80, name: "pci-6025e", n_adchan: 16, adbits: 12,