Skip to content

Commit

Permalink
staging: comedi: adl_pci6208: add support for the PCI-6216 card
Browse files Browse the repository at this point in the history
Add the boardinfo and pci device table information for the PCI-6216 card.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Aug 14, 2012
1 parent 744a839 commit 0a1e6c1
Showing 1 changed file with 18 additions and 6 deletions.
24 changes: 18 additions & 6 deletions drivers/staging/comedi/drivers/adl_pci6208.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@
*/
/*
Driver: adl_pci6208
Description: ADLink PCI-6208A
Devices: [ADLink] PCI-6208A (adl_pci6208)
Description: ADLink PCI-6208/6216 Series Multi-channel Analog Output Cards
Devices: (ADLink) PCI-6208 [adl_pci6208]
(ADLink) PCI-6216 [adl_pci6216]
Author: nsyeow <nsyeow@pd.jaring.my>
Updated: Fri, 30 Jan 2004 14:44:27 +0800
Status: untested
Expand All @@ -43,6 +44,12 @@ Configuration Options: not applicable, uses PCI auto config

#include "../comedidev.h"

/*
* ADLINK PCI Device ID's supported by this driver
*/
#define PCI_DEVICE_ID_PCI6208 0x6208
#define PCI_DEVICE_ID_PCI6216 0x6216

/*
* PCI-6208/6216-GL register map
*/
Expand All @@ -55,7 +62,7 @@ Configuration Options: not applicable, uses PCI auto config
#define PCI6208_DIO_DI_MASK (0xf0)
#define PCI6208_DIO_DI_SHIFT (4)

#define PCI6208_MAX_AO_CHANNELS 8
#define PCI6208_MAX_AO_CHANNELS 16

struct pci6208_board {
const char *name;
Expand All @@ -65,9 +72,13 @@ struct pci6208_board {

static const struct pci6208_board pci6208_boards[] = {
{
.name = "pci6208a",
.dev_id = 0x6208,
.name = "adl_pci6208",
.dev_id = PCI_DEVICE_ID_PCI6208,
.ao_chans = 8,
}, {
.name = "adl_pci6216",
.dev_id = PCI_DEVICE_ID_PCI6216,
.ao_chans = 16,
},
};

Expand Down Expand Up @@ -269,7 +280,8 @@ static void __devexit adl_pci6208_pci_remove(struct pci_dev *dev)
}

static DEFINE_PCI_DEVICE_TABLE(adl_pci6208_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, 0x6208) },
{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI6208) },
{ PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI6216) },
{ 0 }
};
MODULE_DEVICE_TABLE(pci, adl_pci6208_pci_table);
Expand Down

0 comments on commit 0a1e6c1

Please sign in to comment.