Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 324949
b: refs/heads/master
c: 9e07273
h: refs/heads/master
i:
  324947: 51414ad
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 8, 2012
1 parent 7c686b7 commit dac8ea1
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 51 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 06b60981aa66cf5373a3fdcf2e3395db690874f6
refs/heads/master: 9e07273124d5586c4a59c4191cdd1e3743e978f3
70 changes: 43 additions & 27 deletions trunk/drivers/staging/comedi/drivers/me4000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,22 @@ broken.
#include "me4000_fw.h"
#endif

#define PCI_VENDOR_ID_MEILHAUS 0x1402

#define PCI_DEVICE_ID_MEILHAUS_ME4650 0x4650
#define PCI_DEVICE_ID_MEILHAUS_ME4660 0x4660
#define PCI_DEVICE_ID_MEILHAUS_ME4660I 0x4661
#define PCI_DEVICE_ID_MEILHAUS_ME4660S 0x4662
#define PCI_DEVICE_ID_MEILHAUS_ME4660IS 0x4663
#define PCI_DEVICE_ID_MEILHAUS_ME4670 0x4670
#define PCI_DEVICE_ID_MEILHAUS_ME4670I 0x4671
#define PCI_DEVICE_ID_MEILHAUS_ME4670S 0x4672
#define PCI_DEVICE_ID_MEILHAUS_ME4670IS 0x4673
#define PCI_DEVICE_ID_MEILHAUS_ME4680 0x4680
#define PCI_DEVICE_ID_MEILHAUS_ME4680I 0x4681
#define PCI_DEVICE_ID_MEILHAUS_ME4680S 0x4682
#define PCI_DEVICE_ID_MEILHAUS_ME4680IS 0x4683

struct me4000_board {
const char *name;
unsigned short device_id;
Expand All @@ -80,42 +96,42 @@ struct me4000_board {
static const struct me4000_board me4000_boards[] = {
{
.name = "ME-4650",
.device_id = 0x4650,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4650,
.ai_nchan = 16,
.dio_nchan = 32,
}, {
.name = "ME-4660",
.device_id = 0x4660,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4660,
.ai_nchan = 32,
.ai_diff_nchan = 16,
.dio_nchan = 32,
.has_counter = 1,
}, {
.name = "ME-4660i",
.device_id = 0x4661,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4660I,
.ai_nchan = 32,
.ai_diff_nchan = 16,
.dio_nchan = 32,
.has_counter = 1,
}, {
.name = "ME-4660s",
.device_id = 0x4662,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4660S,
.ai_nchan = 32,
.ai_diff_nchan = 16,
.ai_sh_nchan = 8,
.dio_nchan = 32,
.has_counter = 1,
}, {
.name = "ME-4660is",
.device_id = 0x4663,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4660IS,
.ai_nchan = 32,
.ai_diff_nchan = 16,
.ai_sh_nchan = 8,
.dio_nchan = 32,
.has_counter = 1,
}, {
.name = "ME-4670",
.device_id = 0x4670,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4670,
.ao_nchan = 4,
.ai_nchan = 32,
.ai_diff_nchan = 16,
Expand All @@ -124,7 +140,7 @@ static const struct me4000_board me4000_boards[] = {
.has_counter = 1,
}, {
.name = "ME-4670i",
.device_id = 0x4671,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4670I,
.ao_nchan = 4,
.ai_nchan = 32,
.ai_diff_nchan = 16,
Expand All @@ -133,7 +149,7 @@ static const struct me4000_board me4000_boards[] = {
.has_counter = 1,
}, {
.name = "ME-4670s",
.device_id = 0x4672,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4670S,
.ao_nchan = 4,
.ai_nchan = 32,
.ai_diff_nchan = 16,
Expand All @@ -143,7 +159,7 @@ static const struct me4000_board me4000_boards[] = {
.has_counter = 1,
}, {
.name = "ME-4670is",
.device_id = 0x4673,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4670IS,
.ao_nchan = 4,
.ai_nchan = 32,
.ai_diff_nchan = 16,
Expand All @@ -153,7 +169,7 @@ static const struct me4000_board me4000_boards[] = {
.has_counter = 1,
}, {
.name = "ME-4680",
.device_id = 0x4680,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4680,
.ao_nchan = 4,
.ao_fifo = 4,
.ai_nchan = 32,
Expand All @@ -163,7 +179,7 @@ static const struct me4000_board me4000_boards[] = {
.has_counter = 1,
}, {
.name = "ME-4680i",
.device_id = 0x4681,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4680I,
.ao_nchan = 4,
.ao_fifo = 4,
.ai_nchan = 32,
Expand All @@ -173,7 +189,7 @@ static const struct me4000_board me4000_boards[] = {
.has_counter = 1,
}, {
.name = "ME-4680s",
.device_id = 0x4682,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4680S,
.ao_nchan = 4,
.ao_fifo = 4,
.ai_nchan = 32,
Expand All @@ -184,7 +200,7 @@ static const struct me4000_board me4000_boards[] = {
.has_counter = 1,
}, {
.name = "ME-4680is",
.device_id = 0x4683,
.device_id = PCI_DEVICE_ID_MEILHAUS_ME4680IS,
.ao_nchan = 4,
.ao_fifo = 4,
.ai_nchan = 32,
Expand Down Expand Up @@ -2259,20 +2275,20 @@ static void __devexit me4000_pci_remove(struct pci_dev *dev)
}

static DEFINE_PCI_DEVICE_TABLE(me4000_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4650) },
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4660) },
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4661) },
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4662) },
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4663) },
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4670) },
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4671) },
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4672) },
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4673) },
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4680) },
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4681) },
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4682) },
{ PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, 0x4683) },
{ 0 }
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4650)},
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4660)},
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4660I)},
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4660S)},
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4660IS)},
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4670)},
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4670I)},
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4670S)},
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4670IS)},
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4680)},
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4680I)},
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4680S)},
{PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, PCI_DEVICE_ID_MEILHAUS_ME4680IS)},
{0}
};
MODULE_DEVICE_TABLE(pci, me4000_pci_table);

Expand Down
23 changes: 0 additions & 23 deletions trunk/drivers/staging/comedi/drivers/me4000.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,6 @@
#ifndef _ME4000_H_
#define _ME4000_H_

/*=============================================================================
PCI vendor and device IDs
===========================================================================*/

#define PCI_VENDOR_ID_MEILHAUS 0x1402

#define PCI_DEVICE_ID_MEILHAUS_ME4650 0x4650 /* Low Cost version */

#define PCI_DEVICE_ID_MEILHAUS_ME4660 0x4660 /* Standard version */
#define PCI_DEVICE_ID_MEILHAUS_ME4660I 0x4661 /* Isolated version */
#define PCI_DEVICE_ID_MEILHAUS_ME4660S 0x4662 /* Standard version with Sample and Hold */
#define PCI_DEVICE_ID_MEILHAUS_ME4660IS 0x4663 /* Isolated version with Sample and Hold */

#define PCI_DEVICE_ID_MEILHAUS_ME4670 0x4670 /* Standard version */
#define PCI_DEVICE_ID_MEILHAUS_ME4670I 0x4671 /* Isolated version */
#define PCI_DEVICE_ID_MEILHAUS_ME4670S 0x4672 /* Standard version with Sample and Hold */
#define PCI_DEVICE_ID_MEILHAUS_ME4670IS 0x4673 /* Isolated version with Sample and Hold */

#define PCI_DEVICE_ID_MEILHAUS_ME4680 0x4680 /* Standard version */
#define PCI_DEVICE_ID_MEILHAUS_ME4680I 0x4681 /* Isolated version */
#define PCI_DEVICE_ID_MEILHAUS_ME4680S 0x4682 /* Standard version with Sample and Hold */
#define PCI_DEVICE_ID_MEILHAUS_ME4680IS 0x4683 /* Isolated version with Sample and Hold */

/*=============================================================================
ME-4000 base register offsets
===========================================================================*/
Expand Down

0 comments on commit dac8ea1

Please sign in to comment.