From 06a98ef6250210e46cc36b5102636fd24efd18ba Mon Sep 17 00:00:00 2001 From: hartkopp Date: Tue, 22 Jun 2010 20:41:17 +0000 Subject: [PATCH] Added PCI device ID for the PCAN Express Card hardware. Updated module descriptions with PCIe(xpress). git-svn-id: svn://svn.berlios.de//socketcan/trunk@1182 030b6a49-0b11-0410-94ab-b0dab22257f2 --- kernel/2.6/drivers/net/can/sja1000/peak_pci.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/2.6/drivers/net/can/sja1000/peak_pci.c b/kernel/2.6/drivers/net/can/sja1000/peak_pci.c index 9decb90..66877d9 100644 --- a/kernel/2.6/drivers/net/can/sja1000/peak_pci.c +++ b/kernel/2.6/drivers/net/can/sja1000/peak_pci.c @@ -43,8 +43,8 @@ #endif MODULE_AUTHOR("Wolfgang Grandegger "); -MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCI cards"); -MODULE_SUPPORTED_DEVICE("PEAK PCAN PCI CAN card"); +MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCI/PCIe cards"); +MODULE_SUPPORTED_DEVICE("PEAK PCAN PCI/PCIe CAN card"); MODULE_LICENSE("GPL v2"); struct peak_pci { @@ -77,10 +77,14 @@ struct peak_pci { #define PCI_PORT_SIZE 0x0400 /* size of a channel io-memory */ #define PEAK_PCI_VENDOR_ID 0x001C /* the PCI device and vendor IDs */ -#define PEAK_PCI_DEVICE_ID 0x0001 +#define PEAK_PCI_DEVICE_ID 0x0001 /* PCAN PCI and PCIe slot cards */ +#define PEAK_PCIE_CARD_ID 0x0002 /* PCAN ExpressCard */ + +/* TODO: Add LED Status support for PCAN ExpressCard */ static struct pci_device_id peak_pci_tbl[] = { {PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, + {PEAK_PCI_VENDOR_ID, PEAK_PCIE_CARD_ID, PCI_ANY_ID, PCI_ANY_ID,}, {0,} }; -- 2.39.2